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

Merge branch 'master' of github.com:yiisoft/yii2

Browse Source 
* 'master' of github.com:yiisoft/yii2:
  Fixes #699: fixed wrong usage of self and static
  Fixed wrong links
This commit is contained in:
Carsten Brandt
2014-05-06 18:15:10 +02:00
parent 676b366928 d0ddb56639
commit 0df677a064
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/guide/security-authorization.md
View File

@ -460,7 +460,7 @@ of the rule class, you need to respect this hierarchy as well. That is why when
the `execute()` method will return true if the user group is either 1 or 2 (meaning the user is in either "admin"
group or "author" group).
Next, configure `authManager` by listing the two roles in [[yii\rbac\ManagerInterface::defaultRoles]]:
Next, configure `authManager` by listing the two roles in [[yii\rbac\BaseManager::$defaultRoles]]:
```php
return [

8
framework/base/Widget.php
View File

@ -54,7 +54,7 @@ class Widget extends Component implements ViewContextInterface
$config['class'] = get_called_class();
/** @var Widget $widget */
$widget = Yii::createObject($config);
self::$stack[] = $widget;
static::$stack[] = $widget;
return $widget;
}
@ -67,8 +67,8 @@ class Widget extends Component implements ViewContextInterface
*/
public static function end()
{
if (!empty(self::$stack)) {
$widget = array_pop(self::$stack);
if (!empty(static::$stack)) {
$widget = array_pop(static::$stack);
if (get_class($widget) === get_called_class()) {
echo $widget->run();
return $widget;
@ -108,7 +108,7 @@ class Widget extends Component implements ViewContextInterface
public function getId($autoGenerate = true)
{
if ($autoGenerate && $this->_id === null) {
$this->_id = self::$autoIdPrefix . self::$counter++;
$this->_id = static::$autoIdPrefix . static::$counter++;
}
return $this->_id;

4
framework/i18n/GettextMessageSource.php
View File

@ -98,9 +98,9 @@ class GettextMessageSource extends MessageSource
{
$messageFile = Yii::getAlias($this->basePath) . '/' . $language . '/' . $this->catalog;
if ($this->useMoFile) {
$messageFile .= static::MO_FILE_EXT;
$messageFile .= self::MO_FILE_EXT;
} else {
$messageFile .= static::PO_FILE_EXT;
$messageFile .= self::PO_FILE_EXT;
}
return $messageFile;