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

www/protected/controllers/SiteController.php

@@ -129,7 +129,7 @@ class SiteController extends AdminController
 	}
 
     public function actionTest(){
-        echo 'temp0';exit;
+        echo 'temp1000';exit;
         echo Yii::app()->params['o2o_service'][2]['name'];exit;
     }
 }

www/protected/runtime/gii-1.1.13/ControllerCode.php

@@ -0,0 +1,6 @@
+<?php
+return array (
+  'template' => 'default',
+  'baseClass' => 'Controller',
+  'actions' => 'index',
+);

www/protected/runtime/gii-1.1.13/ModuleCode.php

@@ -0,0 +1,4 @@
+<?php
+return array (
+  'template' => 'default',
+);