Skip to content

Could not overrided redirect #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Could not overrided redirect #34

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions Component.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ public function initLanguage()
if ($this->_isValidLanguage($_GET['language-picker-language'])) {
return $this->saveLanguage($_GET['language-picker-language']);
} elseif (!Yii::$app->request->isAjax) {
return $this->_redirect();
return $this->redirect();
}
} elseif (Yii::$app->request->cookies->has($this->cookieName)) {
if ($this->_isValidLanguage(Yii::$app->request->cookies->getValue($this->cookieName))) {
Expand All @@ -150,15 +150,15 @@ public function saveLanguage($language)
Yii::$app->language = $language;
$this->saveLanguageIntoCookie($language);

if (is_callable($this->callback)) {
call_user_func($this->callback);
if (\is_callable($this->callback)) {
\call_user_func($this->callback);
}

if (Yii::$app->request->isAjax) {
Yii::$app->end();
}

return $this->_redirect();
return $this->redirect();
}

/**
Expand Down Expand Up @@ -211,7 +211,7 @@ public function saveLanguageIntoCookie($language)
*
* @return static
*/
private function _redirect()
public function redirect()
{
$redirect = Yii::$app->request->absoluteUrl == Yii::$app->request->referrer ? '/' : Yii::$app->request->referrer;

Expand Down