Changed order of AND to avoid call of function(s)

[mailer.git] / inc / js / js-install_ajax.php

diff --git a/inc/js/js-install_ajax.php b/inc/js/js-install_ajax.php
index 39c54a66c49de074753f167b2819043402450b43..f95ab2f7cdfb2c00b237eb537e1d768eae43ac36 100644 (file)
--- a/inc/js/js-install_ajax.php
+++ b/inc/js/js-install_ajax.php
@@ -38,7 +38,7 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
        die();
-} elseif (!isInstallationPhase()) {
+} elseif ((!isInstallationPhase()) || (!isGetRequestElementSet('install_page'))) {
        return;
 }
 
@@ -48,7 +48,7 @@ $content = array(
 );
 
 // Simply load the JavaScript here
-loadTemplate('js_install_ajax', false, $content);
+loadTemplate('js_install_ajax', FALSE, $content);
 
 // [EOF]
 ?>