Mirrors/yii2
2
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2026-03-06 23:39:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Renamed application to app.

Browse Source
This commit is contained in:
Qiang Xue
2013-02-05 16:12:22 -05:00
parent fcf3f2c893
commit 8b2b7915b4
37 changed files with 87 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
framework/base/Module.php
View File

@@ -73,9 +73,9 @@ abstract class Module extends Component
*
* ~~~
* array(
* 'account' => '@application/controllers/UserController',
* 'account' => '@app/controllers/UserController',
* 'article' => array(
* 'class' => '@application/controllers/PostController',
* 'class' => '@app/controllers/PostController',
* 'pageTitle' => 'something new',
* ),
* )
@@ -311,7 +311,7 @@ abstract class Module extends Component
*
* ~~~
* array(
* '@models' => '@application/models', // an existing alias
* '@models' => '@app/models', // an existing alias
* '@backend' => __DIR__ . '/../backend', // a directory
* )
* ~~~
@@ -563,10 +563,10 @@ abstract class Module extends Component
if (is_array($result)) {
/** @var $controller Controller */
list($controller, $actionID) = $result;
$oldController = Yii::$application->controller;
Yii::$application->controller = $controller;
$oldController = Yii::$app->controller;
Yii::$app->controller = $controller;
$status = $controller->runAction($actionID, $params);
Yii::$application->controller = $oldController;
Yii::$app->controller = $oldController;
return $status;
} else {
throw new InvalidRouteException('Unable to resolve the request: ' . trim($this->getUniqueId() . '/' . $route, '/'));