Action类的魔术方法中对操作方法的判断改进 支持C('ACTION_SUFFIX') 后缀设置

liu21st · liu21st · commit 25423638d487 · 2012-09-01T10:04:53.000+08:00
diff --git a/ThinkPHP/Lib/Core/Action.class.php b/ThinkPHP/Lib/Core/Action.class.php
@@ -158,7 +158,7 @@ public function __get($name) {
      * @return mixed
      */
     public function __call($method,$args) {
-        if( 0 === strcasecmp($method,ACTION_NAME)) {
+        if( 0 === strcasecmp($method,ACTION_NAME.C('ACTION_SUFFIX'))) {
             if(method_exists($this,'_empty')) {
                 // 如果定义了_empty操作 则调用
                 $this->_empty($method,$args);
@@ -261,14 +261,14 @@ protected function success($message,$jumpUrl='',$ajax=false) {
      */
     protected function ajaxReturn($data,$type='') {
         if(func_num_args()>2) {// 兼容3.0之前用法
-            $args   =   func_get_args();
+            $args           =   func_get_args();
             array_shift($args);
-            $info   =   array();
+            $info           =   array();
             $info['data']   =   $data;
             $info['info']   =   array_shift($args);
             $info['status'] =   array_shift($args);
-            $data   =   $info;
-            $type   =   $args?array_shift($args):'';
+            $data           =   $info;
+            $type           =   $args?array_shift($args):'';
         }
         if(empty($type)) $type  =   C('DEFAULT_AJAX_RETURN');
         if(strtoupper($type)=='JSON') {
