From c8d170991249cf9e247bdb17905d14ff99bf6e3e Mon Sep 17 00:00:00 2001
From: Qiang Xue <qiang.xue@gmail.com>
Date: Mon, 7 Apr 2014 14:02:31 -0400
Subject: [PATCH] Fixes #3016.

---
 framework/rbac/DbManager.php  | 3 +++
 framework/rbac/PhpManager.php | 6 +-----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/framework/rbac/DbManager.php b/framework/rbac/DbManager.php
index a4a8396fc9..20b919e9cf 100644
--- a/framework/rbac/DbManager.php
+++ b/framework/rbac/DbManager.php
@@ -655,6 +655,9 @@ class DbManager extends Manager
      */
     public function getRule($name)
     {
+        if ($name === null) {
+            return null;
+        }
         $query = new Query;
         $query->select(['data'])->from($this->ruleTable)->where(['name' => $name]);
         $row = $query->createCommand($this->db)->queryOne();
diff --git a/framework/rbac/PhpManager.php b/framework/rbac/PhpManager.php
index fd6ee0cf5c..cf498413a5 100644
--- a/framework/rbac/PhpManager.php
+++ b/framework/rbac/PhpManager.php
@@ -628,11 +628,7 @@ class PhpManager extends Manager
      */
     public function getRule($name)
     {
-        if (!isset($this->_rules[$name])) {
-            return null;
-        }
-
-        return $this->_rules[$name];
+        return $name !== null && isset($this->_rules[$name]) ? $this->_rules[$name] : null;
     }
 
     /**