From 67af6bc84ac232d9f7634fe58105873ad21c9d40 Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Mon, 10 Mar 2014 15:50:43 +0400
Subject: [PATCH] Fixed inconsistent usage of getters

---
 framework/helpers/BaseUrl.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/framework/helpers/BaseUrl.php b/framework/helpers/BaseUrl.php
index 02fab01cb5..5dffe84aa9 100644
--- a/framework/helpers/BaseUrl.php
+++ b/framework/helpers/BaseUrl.php
@@ -78,7 +78,7 @@ class BaseUrl
 			if ($url !== '' && ($url[0] === '/' || $url[0] === '#' || strpos($url, '://') || !strncmp($url, './', 2))) {
 				return $url;
 			} else {
-				$prefix = $absolute ? Yii::$app->request->getHostInfo() : '';
+				$prefix = $absolute ? Yii::$app->getRequest()->getHostInfo() : '';
 				return $prefix . Yii::$app->getRequest()->getBaseUrl() . '/' . $url;
 			}
 		}
@@ -97,9 +97,9 @@ class BaseUrl
 		}
 
 		if ($name === null) {
-			Yii::$app->user->setReturnUrl($url);
+			Yii::$app->getUser()->setReturnUrl($url);
 		} else {
-			Yii::$app->session->set($name, $url);
+			Yii::$app->getSession()->set($name, $url);
 		}
 	}
 
@@ -112,9 +112,9 @@ class BaseUrl
 	public function previous($name = null)
 	{
 		if ($name === null) {
-			return Yii::$app->user->getReturnUrl();
+			return Yii::$app->getUser()->getReturnUrl();
 		} else {
-			return Yii::$app->session->get($name);
+			return Yii::$app->getSession()->get($name);
 		}
 	}
 
@@ -136,7 +136,7 @@ class BaseUrl
 	 */
 	public function home($absolute = false)
 	{
-		$prefix = $absolute ? Yii::$app->request->getHostInfo() : '';
+		$prefix = $absolute ? Yii::$app->getRequest()->getHostInfo() : '';
 		return $prefix . Yii::$app->getHomeUrl();
 	}
 }