Fixed empty API message/status in primera and wernis extensions

[mailer.git] / inc / functions.php

diff --git a/inc/functions.php b/inc/functions.php
index 5c69d92b29035759c1871c3202bc4c8ed23a0689..70694e75c449baf8e4f3ef561bacd470588d5019 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -921,15 +921,15 @@ function MAKE_TIME($H, $M, $S, $stamp) {
 function LOAD_URL($URL, $addUrlData=true) {
        global $CSS, $_CONFIG, $footer;
 
+       // Compile out URI codes
+       $URL = COMPILE_CODE($URL);
+
        // Check if http(s):// is there
        if ((substr($URL, 0, 7) != "http://") && (substr($URL, 0, 8) != "https://")) {
                // Make all URLs full-qualified
                $URL = URL."/".$URL;
        }
 
-       // Compile out URI codes
-       $URL = COMPILE_CODE($URL);
-
        // Get output buffer
        $OUTPUT = ob_get_contents();
 
@@ -2238,7 +2238,7 @@ function mxchange_die ($msg) {
 
 // Display parsing time and number of SQL queries in footer
 function DISPLAY_PARSING_TIME_FOOTER() {
-       global $startTime, $_CONFIG;
+       global $_CONFIG;
        $endTime = microtime(true);
 
        // Is the timer started?
@@ -2807,7 +2807,7 @@ function DESTROY_ADMIN_SESSION () {
 // Checks if a given apache module is loaded
 function IF_APACHE_MODULE_LOADED ($apacheModule) {
        // Check it and return result
-       return (in_array($apacheModule, apache_get_modules()));
+       return (((function_exists('apache_get_modules')) && (in_array($apacheModule, apache_get_modules()))) || (!function_exists('apache_get_modules')));
 }
 
 //////////////////////////////////////////////////