Browse Source

doc fix.

tags/2.0.0-beta
Qiang Xue 12 years ago
parent
commit
ce4f37a183
  1. 1
      apps/basic/views/layouts/main.php
  2. 2
      framework/yii/base/Controller.php
  3. 2
      framework/yii/debug/Module.php

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

@ -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

@ -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

@ -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 {

Loading…
Cancel
Save