Also use git here.

[mailer.git] / inc / xml-functions.php

diff --git a/inc/xml-functions.php b/inc/xml-functions.php
index 54b494418b6bb31f0e95492ba8c6517400660cd1..87f2d4e1b62f1174b350ff18bb8a643dc2962075 100644 (file)
--- a/inc/xml-functions.php
+++ b/inc/xml-functions.php
@@ -134,7 +134,7 @@ function addXmlSpecialElements ($template) {
 // Parses the XML content
 function parseXmlData ($content) {
        // Is there recode?
-       if (!function_exists('recode')) {
+       if (!extension_loaded('recode')) {
                // No fallback ATM
                reportBug(__FUNCTION__, __LINE__, 'PHP extension recode is missing. Please install it.');
        } // END - if
@@ -308,7 +308,7 @@ function getSqlPartFromXmlArray ($columns) {
        // Walk through all entries
        foreach ($columns as $columnArray) {
                // Must be an array
-               assert(is_array($columnArray), 'columnArray[]=' . gettype($columnArray) . ' must be an array.');
+               assert(is_array($columnArray));
 
                // Init SQL part
                $sqlPart = '';
@@ -462,7 +462,7 @@ function searchXmlArray ($value, $columns, $childKey) {
        // Walk through whole array
        foreach ($columns as $key => $columnArray) {
                // Make sure the element is there
-               assert(isset($columnArray[$childKey]), 'columnArray[' . $childKey . '] is not set.');
+               assert(isset($columnArray[$childKey]));
 
                // Now is it what we are looking for?
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'value=' . $value . ',key=' . $key . ',childKey=' . $childKey . ',columnArray=' . $columnArray[$childKey]);