Merge branch 'test' of git.oschina.net:yiguanjia/php into test

www/protected/modules/moonclub/MoonclubModule.php

@@ -9,9 +9,10 @@ class MoonclubModule extends CWebModule
 
         ));
     }
-    /*public function beforeControllerAction($controller, $action)
+    public function beforeControllerAction($controller, $action)
     {
-        $controller->layout = null;
+        $controller->layout = '//layouts/none';
+
         if(parent::beforeControllerAction($controller, $action))
         {
 
@@ -19,5 +20,5 @@ class MoonclubModule extends CWebModule
         }
         else
             return false;
-    }*/
+    }
 }

www/protected/views/layouts/none.php

@@ -1 +1,2 @@
-<?php echo $content; ?>
+<?php echo $content; ?>
+