Merge remote-tracking branch 'origin/master'

apps/news/Lib/Action/TopicAction.class.php

@@ -12,7 +12,7 @@ class TopicAction extends CommonAction
 {
     protected $school;
     protected $mhm_id;
-    
+
     public function _initialize()
     {
         parent::_initialize();
@@ -80,6 +80,8 @@ class TopicAction extends CommonAction
         $data = D('Topics')->getTopic(1,$_GET['cate'],$map);
         $this->assign('topic_data',$data);
 		if($this->isAjax()) {
+		    var_dump($data);
+		    die;
 			echo json_encode($data);
 			exit();
 		}
@@ -363,4 +365,4 @@ class TopicAction extends CommonAction
     }
 
 
-}
\ No newline at end of file
+}