fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-12 07:11:42 +09:00
Code Issues Projects Releases Packages Wiki Activity

fix redirect when use message module

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@8621 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2011-07-22 07:51:59 +00:00
parent 3ffba2152b
commit 4686c06414
1 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
classes/module/ModuleHandler.class.php
View file

@ -304,7 +304,7 @@
if(!$result)
{
$lastError = $Validator->getLastError();
$returnUrl = Context::get('error_return_url')?Context::get('error_return_url'):getUrl();
$returnUrl = Context::get('error_return_url');
$errorMsg = $lastError['msg'] ? $lastError['msg'] : 'validation error';
//for xml response
@ -349,7 +349,7 @@
if (!$procResult)
{
$this->error = $message;
if (!$redirectUrl) $redirectUrl = Context::get('error_return_url')?Context::get('error_return_url'):getUrl();
if (!$redirectUrl && Context::get('error_return_url')) $redirectUrl = Context::get('error_return_url');
$this->_setInputValueToSession();
}
else
@ -377,6 +377,11 @@
if($_SESSION['XE_VALIDATOR_MESSAGE_TYPE'] && !Context::get('XE_VALIDATOR_MESSAGE_TYPE')) Context::set('XE_VALIDATOR_MESSAGE_TYPE', $_SESSION['XE_VALIDATOR_MESSAGE_TYPE']);
if($_SESSION['XE_VALIDATOR_RETURN_URL'] && !Context::get('XE_VALIDATOR_RETURN_URL')) Context::set('XE_VALIDATOR_RETURN_URL', $_SESSION['XE_VALIDATOR_RETURN_URL']);
$this->_clearErrorSession();
}
function _clearErrorSession()
{
$_SESSION['XE_VALIDATOR_ERROR'] = '';
$_SESSION['XE_VALIDATOR_MESSAGE'] = '';
$_SESSION['XE_VALIDATOR_MESSAGE_TYPE'] = '';
@ -435,6 +440,8 @@
} else {
$oModule = $oMessageObject;
}
$this->_clearErrorSession();
}
// Check if layout_srl exists for the module