Index: branches/RC/core/admin_templates/users/user_edit_password.tpl =================================================================== diff -u -N -r10005 -r10031 --- branches/RC/core/admin_templates/users/user_edit_password.tpl (.../user_edit_password.tpl) (revision 10005) +++ branches/RC/core/admin_templates/users/user_edit_password.tpl (.../user_edit_password.tpl) (revision 10031) @@ -1,6 +1,6 @@ - + Index: branches/RC/core/kernel/processors/main_processor.php =================================================================== diff -u -N -r9841 -r10031 --- branches/RC/core/kernel/processors/main_processor.php (.../main_processor.php) (revision 9841) +++ branches/RC/core/kernel/processors/main_processor.php (.../main_processor.php) (revision 10031) @@ -945,6 +945,8 @@ $this->Application->Redirect( $params['no_group_perm_template'], $redirect_params); } + $redirect_params['lang_mode'] = ''; // if expiration happens while editing language it will be in temp mode + $redirect_params['m_wid'] = ''; // remove wid, otherwise parent window may add wid to its name breaking all the frameset (for targets) $this->Application->Redirect($params['login_template'], $redirect_params); } } Index: branches/RC/core/admin_templates/incs/close_popup.tpl =================================================================== diff -u -N -r8929 -r10031 --- branches/RC/core/admin_templates/incs/close_popup.tpl (.../close_popup.tpl) (revision 8929) +++ branches/RC/core/admin_templates/incs/close_popup.tpl (.../close_popup.tpl) (revision 10031) @@ -33,7 +33,7 @@ } catch (err) { // another website is opened in parent window - alert('proceed_redirect.Error: [' + err.description + ']'); + alert('Error while trying to process redirect in window opener, you should probably close this window. Error message: [' + err.description + ']'); } } else if (!$use_popups) { Index: branches/RC/core/units/general/helpers/permissions_helper.php =================================================================== diff -u -N -r9841 -r10031 --- branches/RC/core/units/general/helpers/permissions_helper.php (.../permissions_helper.php) (revision 9841) +++ branches/RC/core/units/general/helpers/permissions_helper.php (.../permissions_helper.php) (revision 10031) @@ -367,6 +367,8 @@ } $redirect_params = $this->Application->HttpQuery->getRedirectParams(); + $redirect_params['lang_mode'] = ''; + $redirect_params['m_wid'] = ''; if (array_key_exists('pass_category', $params)) { $redirect_params['pass_category'] = $params['pass_cateogry']; Index: branches/RC/core/admin_templates/js/ajax.js =================================================================== diff -u -N -r9643 -r10031 --- branches/RC/core/admin_templates/js/ajax.js (.../ajax.js) (revision 9643) +++ branches/RC/core/admin_templates/js/ajax.js (.../ajax.js) (revision 10031) @@ -314,12 +314,13 @@ AjaxPopupManager.prototype.successCallback = function($request, $params, $object) { var $responce = $request.responseText; - var $match_redirect = new RegExp('^#redirect#(.*)').exec($responce); + /*var $match_redirect = new RegExp('^#redirect#(.*)').exec($responce); if ($match_redirect != null) { + alert('AJAX REDIRECT!!!') // redirect to external template requested window.location.href = $match_redirect[1]; return false; - } + }*/ switch ($params[0]) { case 'GetSize':