diff --git a/classes/module/ModuleHandler.class.php b/classes/module/ModuleHandler.class.php
index a41c94e36..ab7f0c1c4 100644
--- a/classes/module/ModuleHandler.class.php
+++ b/classes/module/ModuleHandler.class.php
@@ -943,18 +943,18 @@ class ModuleHandler extends Handler
// Handle iframe form submissions.
if(isset($_POST['_rx_target_iframe']) && starts_with('_rx_temp_', $_POST['_rx_target_iframe']))
{
+ if($_SESSION['XE_VALIDATOR_RETURN_URL'])
+ {
+ ob_end_clean();
+ echo sprintf('', json_encode($_SESSION['XE_VALIDATOR_RETURN_URL']));
+ return;
+ }
if($this->error)
{
ob_end_clean();
echo sprintf('', json_encode($this->error), json_encode($_POST['_rx_target_iframe']));
return;
}
- elseif($_SESSION['XE_VALIDATOR_RETURN_URL'])
- {
- ob_end_clean();
- echo sprintf('', json_encode($_SESSION['XE_VALIDATOR_RETURN_URL']));
- return;
- }
}
// Handle redirects.