Final fixes for SQL execution

[mailer.git] / inc / extensions.php

diff --git a/inc/extensions.php b/inc/extensions.php
index 61fe0afa93182eb3374c5d1048dc0538de2cf2fd..1439e97a8c18e1e9bc0be0828af2670fdb0c3629 100644 (file)
--- a/inc/extensions.php
+++ b/inc/extensions.php
@@ -127,7 +127,7 @@ function LOAD_EXTENSION ($ext_name, $EXT_LOAD_MODE = "", $EXT_VER = "", $dry_run
 function EXTENSION_REGISTER ($ext_name, $task_id, $dry_run = false, $logout = true) {
        global $UPDATE_NOTES, $INC_POOL, $cacheInstance;
        global $EXT_VER_HISTORY, $NOTES, $EXT_ALWAYS_ACTIVE, $EXT_VERSION;
 function EXTENSION_REGISTER ($ext_name, $task_id, $dry_run = false, $logout = true) {
        global $UPDATE_NOTES, $INC_POOL, $cacheInstance;
        global $EXT_VER_HISTORY, $NOTES, $EXT_ALWAYS_ACTIVE, $EXT_VERSION;

-       global $EXT_UPDATE_DEPENDS, $SQLs;
+       global $EXT_UPDATE_DEPENDS;

 
        // This shall never do a non-admin user!
        if (!IS_ADMIN()) return false;
 
        // This shall never do a non-admin user!
        if (!IS_ADMIN()) return false;


@@ -225,7 +225,7 @@ function EXTENSION_REGISTER ($ext_name, $task_id, $dry_run = false, $logout = tr
                        // "Dry-run-mode" activated?
                        if (!$dry_run) {
                                // Run installation pre-installation filters
                        // "Dry-run-mode" activated?
                        if (!$dry_run) {
                                // Run installation pre-installation filters

-                               RUN_FILTER('pre_extension_installed', false, array('dry_run' => $dry_run, 'sqls' => $SQLs));
+                               RUN_FILTER('pre_extension_installed', array('dry_run' => $dry_run, 'sqls' => $SQLs));

 
                                // Register extension
                                $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_extensions (ext_name, ext_active, ext_version) VALUES ('%s','%s','%s')",
 
                                // Register extension
                                $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_extensions (ext_name, ext_active, ext_version) VALUES ('%s','%s','%s')",


@@ -280,7 +280,7 @@ function EXTENSION_REGISTER ($ext_name, $task_id, $dry_run = false, $logout = tr
 // Run SQL queries for given extension id
 // @TODO Change from ext_id to ext_name (not just even the variable! ;-) )
 function EXTENSION_RUN_SQLS ($ext_id, $load_mode) {
 // Run SQL queries for given extension id
 // @TODO Change from ext_id to ext_name (not just even the variable! ;-) )
 function EXTENSION_RUN_SQLS ($ext_id, $load_mode) {

-       global $cacheInstance, $SQLs;
+       global $cacheInstance;

 
        // This shall never do a non-admin user!
        if (!IS_ADMIN()) return false;
 
        // This shall never do a non-admin user!
        if (!IS_ADMIN()) return false;


@@ -419,7 +419,7 @@ function GET_EXT_VERSION ($ext_name) {
 function EXTENSION_UPDATE ($ext_name, $ext_ver, $dry_run = false) {
        // This shall never do a non-admin user!
        global $cacheInstance, $UPDATE_NOTES, $NOTES, $EXT_VER_HISTORY;
 function EXTENSION_UPDATE ($ext_name, $ext_ver, $dry_run = false) {
        // This shall never do a non-admin user!
        global $cacheInstance, $UPDATE_NOTES, $NOTES, $EXT_VER_HISTORY;

-       global $EXT_UPDATE_DEPENDS, $EXT_VERSION, $INC_POOL, $cacheArray;
+       global $EXT_UPDATE_DEPENDS, $EXT_VERSION, $INC_POOL, $cacheArray, $SQLs;

 
        // Init arrays
        $SQLs = array(); $INC_POOL = array();
 
        // Init arrays
        $SQLs = array(); $INC_POOL = array();


@@ -512,7 +512,7 @@ function EXTENSION_UPDATE ($ext_name, $ext_ver, $dry_run = false) {
                        // In "dry-run" mode return array with SQL commands
                        return $SQLs;
                }
                        // In "dry-run" mode return array with SQL commands
                        return $SQLs;
                }

-       }
+       } // END - if

 }
 
 // Output verbose SQL table for extension
 }
 
 // Output verbose SQL table for extension