php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-30 22:48:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

doc fix.

Browse Source
This commit is contained in:
Qiang Xue
2013-08-11 16:14:59 -04:00
parent 71b8dfdb2e
commit ce4f37a183
3 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
apps/basic/views/layouts/main.php
View File

@@ -1,5 +1,4 @@
<?php <?php
use yii\bootstrap\Nav;
use yii\bootstrap\NavBar; use yii\bootstrap\NavBar;
use yii\helpers\Html; use yii\helpers\Html;
use yii\widgets\Menu; use yii\widgets\Menu;

2
framework/yii/base/Controller.php
View File

@@ -281,7 +281,7 @@ class Controller extends Component
* - an absolute path (e.g. "/main"): the layout name starts with a slash. The actual layout file will be * - an absolute path (e.g. "/main"): the layout name starts with a slash. The actual layout file will be
* looked for under the [[Application::layoutPath|layout path]] of the application; * looked for under the [[Application::layoutPath|layout path]] of the application;
* - a relative path (e.g. "main"): the actual layout layout file will be looked for under the * - a relative path (e.g. "main"): the actual layout layout file will be looked for under the
* [[Module::viewPath|view path]] of the context module. * [[Module::layoutPath|layout path]] of the context module.
* *
* If the layout name does not contain a file extension, it will use the default one `.php`. * If the layout name does not contain a file extension, it will use the default one `.php`.
* *

2
framework/yii/debug/Module.php
View File

@@ -69,7 +69,7 @@ class Module extends \yii\base\Module
$this->logTarget = null; $this->logTarget = null;
if ($this->checkAccess($action)) { if ($this->checkAccess($action)) {
return true; return parent::beforeAction($action);
} elseif ($action->id === 'toolbar') { } elseif ($action->id === 'toolbar') {
return false; return false;
} else { } else {