php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-08-26 14:26:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #3016.

Browse Source
This commit is contained in:
Qiang Xue
2014-04-07 14:02:31 -04:00
parent 2a038a1bc8
commit c8d1709912
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
framework/rbac/DbManager.php
View File

@ -655,6 +655,9 @@ class DbManager extends Manager
*/ */
public function getRule($name) public function getRule($name)
{ {
if ($name === null) {
return null;
}
$query = new Query; $query = new Query;
$query->select(['data'])->from($this->ruleTable)->where(['name' => $name]); $query->select(['data'])->from($this->ruleTable)->where(['name' => $name]);
$row = $query->createCommand($this->db)->queryOne(); $row = $query->createCommand($this->db)->queryOne();

6
framework/rbac/PhpManager.php
View File

@ -628,11 +628,7 @@ class PhpManager extends Manager
*/ */
public function getRule($name) public function getRule($name)
{ {
if (!isset($this->_rules[$name])) { return $name !== null && isset($this->_rules[$name]) ? $this->_rules[$name] : null;
return null;
}
return $this->_rules[$name];
} }
/** /**