Merge remote-tracking branch 'origin/master'

apps/home/Lib/Action/UserAction.class.php

@@ -155,10 +155,8 @@ class UserAction extends CommonAction
         $this->assign('vip', $vip);
         $this->assign('vip', $vip);
         // 测试用
         // 测试用
         if ($_GET['aaa']) {
         if ($_GET['aaa']) {
-            echo 111;
             $this->display('index1');
             $this->display('index1');
         } else {
         } else {
-            echo 222;
             $this->display();
             $this->display();
         }
         }
 
 

core/OpenSociax/Eduline/Action.class.php

@@ -553,6 +553,7 @@ abstract class Action
         if (APP_NAME == admin || strrpos(MODULE_NAME, 'Admin') === 0) {
         if (APP_NAME == admin || strrpos(MODULE_NAME, 'Admin') === 0) {
             $templateFile = $templateFile;
             $templateFile = $templateFile;
         } else {
         } else {
+            echo $templateFile;
             $this->is_pc ? $templateFile : $templateFile = ($templateFile ?: ACTION_NAME) . "_w3g";
             $this->is_pc ? $templateFile : $templateFile = ($templateFile ?: ACTION_NAME) . "_w3g";
         }
         }