Mailer project continued:

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

diff --git a/inc/loader/load-extension.php b/inc/loader/load-extension.php
index 966df4784cad8480a8696cfe82d2b376b4a141f8..746957a8ccc473e9f646bba855c42b3e33ec04e8 100644 (file)
--- a/inc/loader/load-extension.php
+++ b/inc/loader/load-extension.php
@@ -18,7 +18,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -53,7 +53,7 @@ if (($GLOBALS['cache_instance']->loadCacheFile('extension')) && ($GLOBALS['cache
        // Init extension inc-pool
        $EXT_POOL = array();
 
-       // Do we have entries?
+       // Are there entries?
        if (count($EXT_DUMMY) > 0) {
                // Init arrays
                $EXT_NAMES = array();
@@ -67,7 +67,7 @@ if (($GLOBALS['cache_instance']->loadCacheFile('extension')) && ($GLOBALS['cache
 
                        // Load extension file itself
                        if (($EXT_DUMMY['ext_active'][$k] == 'Y') || ($EXT_DUMMY['ext_keep'][$k] == 'Y')) {
-                               $EXT_POOL[] = $ext_name;
+                               array_push($EXT_POOL, $ext_name);
                        } // END - if
 
                        // Version number
@@ -143,7 +143,16 @@ if (($GLOBALS['cache_instance']->loadCacheFile('extension')) && ($GLOBALS['cache
        } // 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)) {
@@ -152,7 +161,7 @@ if (($GLOBALS['cache_instance']->loadCacheFile('extension')) && ($GLOBALS['cache
                        // Is the name valid?
                        if (!isExtensionNameValid($content['ext_name'])) {
                                // Is not valid name (empty ext-foo.php script)
-                               SQL_QUERY_ESC("DELETE LOW_PRIRITY FROM `{?_MYSQL_PREFIX?}_extensions` WHERE `ext_name`='%s' LIMIT 1",
+                               SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_extensions` WHERE `ext_name`='%s' LIMIT 1",
                                        array($content['ext_name']), __FILE__, __LINE__);
                        } else {
                                // Didn't load so deactivate it