Permalink
Browse files

Logout shouldn’t include language when monolingual

Let LinkUtil::link decide whether or not to include session language in link
  • Loading branch information...
sabberworm committed Oct 30, 2012
1 parent 7639392 commit ecaa1978ca677df1f7bb62d8d491c6d9e7782a59
@@ -77,6 +77,7 @@ private static function getPageFullPathArray() {
}
public function getPageLink() {
return LinkUtil::link(self::getPageFullPathArray(), 'FrontendManager', array(), AdminManager::getContentLanguage());
Session::getSession()->setLanguage(AdminManager::getContentLanguage());
return LinkUtil::link(self::getPageFullPathArray(), 'FrontendManager');
}
}
@@ -23,7 +23,7 @@ Widget.types.login_window = {
username.val(username.data('default_value')).addClass('input_default_state');
password.val(password.data('default_value')).addClass('input_default_state');
_this.login_markup.find('.ui-notify').hide();

var forgotten_alert = jQuery('<div class="rapila_alert"><form/></div>');
forgotten_alert.children('form').append(Widget.parseHTML("{{includeTemplate=password_forgotten_window.incl}}")).one('submit', function(event) {
event.preventDefault();

0 comments on commit ecaa197

Please sign in to comment.