diff --git a/framework/base/control.class.php b/framework/base/control.class.php index 5583d43233..4cd809322f 100644 --- a/framework/base/control.class.php +++ b/framework/base/control.class.php @@ -1158,7 +1158,7 @@ class baseControl foreach($message as $item => $errors) $message[$item] = implode(',', $errors); return helper::end(js::alert(strip_tags(implode('\n', $message)))); } - elseif(empty($_SERVER['HTTP_REFERER']) && !empty($data['load']['alert'])) + elseif((empty($_SERVER['HTTP_REFERER']) || $this->viewType == 'html') && !empty($data['load']['alert'])) { if(empty($data['load']['locate'])) return helper::end(js::alert($data['load']['alert'])); return helper::end(js::alert($data['load']['alert']) . js::locate($data['load']['locate']));