This 'return FALSE' caused that the PHP's error handler was called :( So, do NEVER...

[mailer.git] / inc / loader / load-extension.php

diff --git a/inc/loader/load-extension.php b/inc/loader/load-extension.php
index 8de1d6aedc2e72bbc9a797e47e7fb2e56ed82102..8452a87aa2dae03c2af5fa091267e10045009372 100644 (file)
--- a/inc/loader/load-extension.php
+++ b/inc/loader/load-extension.php
@@ -123,7 +123,7 @@ if (($GLOBALS['cache_instance']->loadCacheFile('extension')) && ($GLOBALS['cache
        unset($EXT_DUMMY);
 
        // No database load needed
-       $res_ext_crt = false;
+       $res_ext_crt = FALSE;
 
        // Load all extension files in test-mode (we initialize them later)
        foreach ($EXT_POOL as $ext) {
@@ -136,14 +136,23 @@ if (($GLOBALS['cache_instance']->loadCacheFile('extension')) && ($GLOBALS['cache
        // Create cache file here
        $GLOBALS['cache_instance']->init();
 
-       // Add more if sql_patches is recent enougth
+       // Add more if ext-sql_patches is recent enougth
        $add = '';
        if (isExtensionInstalledAndNewer('sql_patches', '0.0.6')) {
                $add = ',`ext_has_css` AS `ext_css`';
        } // END - if
 
        // Query for all extensions
-       $result = SQL_QUERY('SELECT `id` AS `ext_id`,`ext_name`,`ext_active`,`ext_version`' . $add . ' FROM `{?_MYSQL_PREFIX?}_extensions` ORDER BY `ext_name` ASC', __FILE__, __LINE__);
+       $result = SQL_QUERY('SELECT
+       `id` AS `ext_id`,
+       `ext_name`,
+       `ext_active`,
+       `ext_version`
+' . $add . '
+FROM
+       `{?_MYSQL_PREFIX?}_extensions`
+ORDER BY
+       `ext_name` ASC', __FILE__, __LINE__);
 
        // Load all entries
        while ($content = SQL_FETCHARRAY($result)) {
@@ -156,7 +165,7 @@ if (($GLOBALS['cache_instance']->loadCacheFile('extension')) && ($GLOBALS['cache
                                        array($content['ext_name']), __FILE__, __LINE__);
                        } else {
                                // Didn't load so deactivate it
-                               doDeactivateExtension($content['ext_name'], true);
+                               doDeactivateExtension($content['ext_name'], TRUE);
                        }
 
                        // ... and skip it
@@ -164,7 +173,7 @@ if (($GLOBALS['cache_instance']->loadCacheFile('extension')) && ($GLOBALS['cache
                } // END - if
 
                // Get menu entry
-               $content['ext_menu'] = convertBooleanToYesNo(ifModuleHasMenu($content['ext_name'], true));
+               $content['ext_menu'] = convertBooleanToYesNo(ifModuleHasMenu($content['ext_name'], TRUE));
 
                // Get language entry
                $content['ext_lang'] = convertBooleanToYesNo(isLanguageIncludeReadable($content['ext_name']));