Even more constants/language strings rewritten, merge_array() now logs debug messages

[mailer.git] / inc / functions.php

diff --git a/inc/functions.php b/inc/functions.php
index 2fc50d3c0b25cf8714d28db253b4ab2cd953f644..6f668fc188a1775352b19ec101e1b93074eb1597 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -2397,10 +2397,15 @@ function merge_array ($array1, $array2) {
                return array_merge($array1, $array2);
        } elseif (is_array($array1)) {
                // Return left array
+               DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("array2 is not an array. array != %s", gettype($array2)));
                return $array1;
+       } elseif (is_array($array2)) {
+               // Return right array
+               DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("array1 is not an array. array != %s", gettype($array1)));
+               return $array2;
        }
 
-       // Something wired happened here...
+       // Both are not arrays
        print(__FUNCTION__.":<pre>");
        debug_print_backtrace();
        die("</pre>");