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

Fixed inconsistent usage of getters

Browse Source
This commit is contained in:
Alexander Makarov
2014-03-10 15:50:43 +04:00
parent cb5a889621
commit 67af6bc84a
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
framework/helpers/BaseUrl.php
View File

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