From 89aa62f2ef7b2f656b1c87d9fe340738325a6e06 Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Wed, 13 Nov 2013 12:57:49 +0400
Subject: [PATCH] Moved authManager from base to web application since it's
 rarely used in apps other than web and can be set in config if needed

---
 framework/yii/base/Application.php | 10 ----------
 framework/yii/web/Application.php  | 10 ++++++++++
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/framework/yii/base/Application.php b/framework/yii/base/Application.php
index 497cb2fb530..23a3275cbc6 100644
--- a/framework/yii/base/Application.php
+++ b/framework/yii/base/Application.php
@@ -14,7 +14,6 @@
 /**
  * Application is the base class for all application classes.
  *
- * @property \yii\rbac\Manager $authManager The auth manager for this application. This property is read-only.
  * @property string $basePath The root directory of the application.
  * @property \yii\caching\Cache $cache The cache application component. Null if the component is not enabled.
  * This property is read-only.
@@ -452,15 +451,6 @@ public function getI18n()
 		return $this->getComponent('i18n');
 	}
 
-	/**
-	 * Returns the auth manager for this application.
-	 * @return \yii\rbac\Manager the auth manager for this application.
-	 */
-	public function getAuthManager()
-	{
-		return $this->getComponent('authManager');
-	}
-
 	/**
 	 * Registers the core application components.
 	 * @see setComponents
diff --git a/framework/yii/web/Application.php b/framework/yii/web/Application.php
index 13b55888da6..b759516db35 100644
--- a/framework/yii/web/Application.php
+++ b/framework/yii/web/Application.php
@@ -13,6 +13,7 @@
 /**
  * Application is the base class for all web application classes.
  *
+ * @property \yii\rbac\Manager $authManager The auth manager for this application. This property is read-only.
  * @property AssetManager $assetManager The asset manager component. This property is read-only.
  * @property string $homeUrl The homepage URL.
  * @property Request $request The request component. This property is read-only.
@@ -151,6 +152,15 @@ public function getUser()
 		return $this->getComponent('user');
 	}
 
+	/**
+	 * Returns the auth manager for this application.
+	 * @return \yii\rbac\Manager the auth manager for this application.
+	 */
+	public function getAuthManager()
+	{
+		return $this->getComponent('authManager');
+	}
+
 	/**
 	 * Returns the asset manager.
 	 * @return AssetManager the asset manager component