Removed all LIMIT x statements from extension removal queries, several minor fixes

diff --git a/inc/extensions.php b/inc/extensions.php
index 1fd297707c9bc120267ea49e1bb350ff6d5b6714..5e94c32dc37823142f528d7483cdf75ad553820b 100644 (file)
--- a/inc/extensions.php
+++ b/inc/extensions.php
@@ -138,6 +138,21 @@ function EXTENSION_REGISTER ($ext_name, $task_id, $dry_run = false, $logout = tr
        // Is this extension already installed?
        if (EXT_IS_ACTIVE($ext_name)) return false;
 
+       // Is the task id zero? Then we need to auto-fix it here
+       if ($task_id == 0) {
+               // Try to find the task
+               $task_id = DETERMINE_EXTENSION_TASK_ID($ext_name);
+
+               // Still zero and not in dry-run?
+               if (($task_id == 0) && (!$dry_run)) {
+                       // Then request a bug report
+                       debug_report_bug(sprintf("%s: task_id is still zero after DETERMINE_EXTENSION_TASK_ID(%s)",
+                               __FUNCTION__,
+                               $ext_name
+                       ));
+               } // END - if
+       } // END - if
+
        // Init queries
        INIT_SQLS();
 

diff --git a/inc/extensions/ext-active.php b/inc/extensions/ext-active.php
index 61a3106a8b96a52a6ee7add9b687f1ac1e965422..66494ef924c1a0f6d2a2ebc4ce7a1209a0597f05 100644 (file)
--- a/inc/extensions/ext-active.php
+++ b/inc/extensions/ext-active.php
@@ -57,8 +57,8 @@ case "register": // Do stuff when installation is running (modules.php?module=ad
 
 case "remove": // Do stuff when removing extension
        // SQL commands to run
-       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_guest_menu` WHERE `what`='active' LIMIT 1");
-       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE `what`='config_active' LIMIT 1");
+       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_guest_menu` WHERE `what`='active'");
+       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE `what`='config_active'");
 
        // Unregister filter
        UNREGISTER_FILTER('online_extra_links', 'ADD_LINK_ACTIVE_LIST', true, $dry_run);

diff --git a/inc/extensions/ext-admins.php b/inc/extensions/ext-admins.php
index 39402c318f4ce520fa0c01e52dfa78e59ee2dc6d..0d31836fd9e8dc6f6cd0a920094739c60d6c8ba1 100644 (file)
--- a/inc/extensions/ext-admins.php
+++ b/inc/extensions/ext-admins.php
@@ -59,7 +59,7 @@ case "register": // Do stuff when installation is running (modules.php?module=ad
 
 case "remove": // Do stuff when removing extension
        // SQL commands to run
-       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE `action`='admins' LIMIT 6");
+       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE `action`='admins'");
        ADD_SQL("DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_admins_acls`");
        ADD_SQL("DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_admins_mails`");
        ADD_SQL("ALTER TABLE `{!_MYSQL_PREFIX!}_admins` DROP default_acl");

diff --git a/inc/extensions/ext-admintheme1.php b/inc/extensions/ext-admintheme1.php
index ae20abaa725cd3ae17088968f68dfe87015c5c82..55729a2b4210eb3e82e42d2d0a9341166a3d0ade 100644 (file)
--- a/inc/extensions/ext-admintheme1.php
+++ b/inc/extensions/ext-admintheme1.php
@@ -53,9 +53,9 @@ switch ($EXT_LOAD_MODE)
 case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called)
        // Remove all other themes
        ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_extensions` WHERE ext_name LIKE 'admintheme%'");
-       ADD_SQL("UPDATE `{!_MYSQL_PREFIX!}_admin_menu` SET `action`='stats' WHERE `what`='usr_online' LIMIT 1");
-       ADD_SQL("UPDATE `{!_MYSQL_PREFIX!}_admin_menu` SET `action`='stats' WHERE `what`='email_stats' LIMIT 1");
-       ADD_SQL("UPDATE `{!_MYSQL_PREFIX!}_admin_menu` SET `action`='misc' WHERE `what`='maintenance' LIMIT 1");
+       ADD_SQL("UPDATE `{!_MYSQL_PREFIX!}_admin_menu` SET `action`='stats' WHERE `what`='usr_online'");
+       ADD_SQL("UPDATE `{!_MYSQL_PREFIX!}_admin_menu` SET `action`='stats' WHERE `what`='email_stats'");
+       ADD_SQL("UPDATE `{!_MYSQL_PREFIX!}_admin_menu` SET `action`='misc' WHERE `what`='maintenance'");
        break;
 
 case "remove": // Do stuff when removing extension

diff --git a/inc/extensions/ext-autopurge.php b/inc/extensions/ext-autopurge.php
index baf29106b8bc590303f2b394113715d784ceefec..4542fb18a1b1089ed2b1e51b96ffd86da4f682d4 100644 (file)
--- a/inc/extensions/ext-autopurge.php
+++ b/inc/extensions/ext-autopurge.php
@@ -66,7 +66,7 @@ case "remove": // Do stuff when removing extension
        {
                ADD_SQL("ALTER TABLE `{!_MYSQL_PREFIX!}_bonus` MODIFY data_type ENUM('NEW','QUEUE','SEND') NOT NULL DEFAULT 'NEW'");
        }
-       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE what IN('config_autopurge','list_autopurge') LIMIT 2");
+       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE what IN('config_autopurge','list_autopurge')");
        ADD_SQL("ALTER TABLE `{!_MYSQL_PREFIX!}_user_data` DROP ap_notified");
        break;
 

diff --git a/inc/extensions/ext-bank.php b/inc/extensions/ext-bank.php
index eaf7987b07661e3208101931d1b98b0a97dd31d8..1e507a8a3e0b95be32584345ab7ebbca49c60bf3 100644 (file)
--- a/inc/extensions/ext-bank.php
+++ b/inc/extensions/ext-bank.php
@@ -160,8 +160,8 @@ case "remove": // Do stuff when removing extension
        ADD_SQL("DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_bank_transfers`");
        ADD_SQL("DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_bank_packages`");
        ADD_SQL("DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_bank_tanlist`");
-       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE `action`='bank' LIMIT 14");
-       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_member_menu` WHERE `action`='bank' LIMIT 8");
+       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE `action`='bank'");
+       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_member_menu` WHERE `action`='bank'");
        break;
 
 case "activate": // Do stuff when admin activates this extension

diff --git a/inc/extensions/ext-beg.php b/inc/extensions/ext-beg.php
index 59cf530771141e38a99225cb7d12f57d8d14d55e..af774a5d66fda416ddc1e32084843e080147122e 100644 (file)
--- a/inc/extensions/ext-beg.php
+++ b/inc/extensions/ext-beg.php
@@ -72,9 +72,9 @@ PRIMARY KEY(id)
 
 case "remove": // Do stuff when removing extension
        // SQL commands to run
-       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE `what`='config_beg' OR `what`='list_beg' LIMIT 2");
-       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_guest_menu` WHERE `what`='beg' LIMIT 1");
-       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_member_menu` WHERE `what`='beg' OR `what`='beg2' LIMIT 2");
+       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE `what`='config_beg' OR `what`='list_beg'");
+       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_guest_menu` WHERE `what`='beg'");
+       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_member_menu` WHERE `what`='beg' OR `what`='beg2'");
        ADD_SQL("DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_beg_ips`");
        break;
 

diff --git a/inc/extensions/ext-birthday.php b/inc/extensions/ext-birthday.php
index 18d328c256f67fc81fc9f15d3a7c88441fde172c..ffbfc09f501eebb65ec9d6b1dbea3e85350fc830 100644 (file)
--- a/inc/extensions/ext-birthday.php
+++ b/inc/extensions/ext-birthday.php
@@ -59,7 +59,7 @@ case "remove": // Do stuff when removing extension
        // SQL commands to run
        ADD_SQL("ALTER TABLE `{!_MYSQL_PREFIX!}_user_data` DROP birthday_sent");
        ADD_SQL("DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_user_birthday`");
-       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE `what`='config_birthday' LIMIT 1");
+       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE `what`='config_birthday'");
        break;
 
 case "activate": // Do stuff when admin activates this extension

diff --git a/inc/extensions/ext-bonus.php b/inc/extensions/ext-bonus.php
index 17ec62a7a0e9ff52ede44f0a3a5a2d7e664f17bb..d2459f3306689806716939468ff18afcbb49cbc1 100644 (file)
--- a/inc/extensions/ext-bonus.php
+++ b/inc/extensions/ext-bonus.php
@@ -82,9 +82,9 @@ PRIMARY KEY  (id)
 
 case "remove": // Do stuff when removing extension
        // SQL commands to run
-       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE what IN ('bonus','config_bonus','send_bonus','list_bonus','list_notifications') LIMIT 5");
-       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_member_menu` WHERE `what`='bonus' LIMIT 1");
-       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_guest_menu` WHERE `action`='bonus' LIMIT 1");
+       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE what IN ('bonus','config_bonus','send_bonus','list_bonus','list_notifications')");
+       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_member_menu` WHERE `what`='bonus'");
+       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_guest_menu` WHERE `action`='bonus'");
        ADD_SQL("ALTER TABLE `{!_MYSQL_PREFIX!}_user_links` MODIFY link_type ENUM('NORMAL') NOT NULL DEFAULT 'NORMAL'");
        ADD_SQL("ALTER TABLE `{!_MYSQL_PREFIX!}_user_links` DROP bonus_id");
        ADD_SQL("DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_bonus`");

diff --git a/inc/extensions/ext-booking.php b/inc/extensions/ext-booking.php
index 03d109f82dc238ed503736fefe62dfa574549d07..e8f107978b43c35c92628616c84ce50c6bea5b9e 100644 (file)
--- a/inc/extensions/ext-booking.php
+++ b/inc/extensions/ext-booking.php
@@ -77,8 +77,8 @@ PRIMARY KEY(`id`)
 
 case "remove": // Do stuff when removing extension
        ADD_SQL("DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_user_book`");
-       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE `what` IN ('config_booking','list_booking') LIMIT 2");
-       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_member_menu` WHERE `what`='booking' LIMIT 1");
+       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE `what` IN ('config_booking','list_booking')");
+       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_member_menu` WHERE `what`='booking'");
        break;
 
 case "activate": // Do stuff when admin activates this extension

diff --git a/inc/extensions/ext-cache.php b/inc/extensions/ext-cache.php
index 887639c770de18ad020244d9222432618d4a332d..fcf7e910a0300c7a3cb9d834a415476590119af6 100644 (file)
--- a/inc/extensions/ext-cache.php
+++ b/inc/extensions/ext-cache.php
@@ -61,7 +61,7 @@ case "register": // Do stuff when installation is running (modules.php?module=ad
 
 case "remove": // Do stuff when removing extension
        // SQL commands to run
-       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE `what`='config_cache' OR `what`='cache_stats' LIMIT 2");
+       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE `what` IN('config_cache','cache_stats')");
 
        // Unregister all filters
        UNREGISTER_FILTER('extension_update', 'CACHE_DESTROY_ON_EXT_CHANGE', true, $dry_run);

diff --git a/inc/extensions/ext-country.php b/inc/extensions/ext-country.php
index 3f8702a5f7ee50ac38faca83d7f5cec7fb45e4bd..2d5ecdaa20ba4ffe1df99d4f9ea27758b80f9821 100644 (file)
--- a/inc/extensions/ext-country.php
+++ b/inc/extensions/ext-country.php
@@ -74,7 +74,7 @@ PRIMARY KEY(id)
 case "remove": // Do stuff when removing extension
        // SQL commands to run
        ADD_SQL("DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_countries`");
-       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE `action`='country' LIMIT 2");
+       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE `action`='country'");
        break;
 
 case "activate": // Do stuff when admin activates this extension

diff --git a/inc/extensions/ext-debug.php b/inc/extensions/ext-debug.php
index 07a2b733084d5b577a1ab399425a4e3a8ceada16..848c5415602d1d140898c599415fe832695871f0 100644 (file)
--- a/inc/extensions/ext-debug.php
+++ b/inc/extensions/ext-debug.php
@@ -141,8 +141,8 @@ case "remove": // Do stuff when removing extension
        ADD_SQL("DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_debug_client`");
        ADD_SQL("DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_debug_log`");
        ADD_SQL("DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_debug_log_abuse`");
-       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_guest_menu` WHERE `action`='debug' LIMIT 5");
-       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE `action`='debug' LIMIT 6");
+       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_guest_menu` WHERE `action`='debug'");
+       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE `action`='debug'");
        break;
 
 case "activate": // Do stuff when admin activates this extension

diff --git a/inc/extensions/ext-doubler.php b/inc/extensions/ext-doubler.php
index cafcd848dc0bdc1736c99fc8e78eeeef888e661d..0bf3f2b9875b7efc6a5898c43909d1398b28cf92 100644 (file)
--- a/inc/extensions/ext-doubler.php
+++ b/inc/extensions/ext-doubler.php
@@ -120,9 +120,9 @@ PRIMARY KEY(id)
 case "remove": // Do stuff when removing extension
        // SQL commands to run
        ADD_SQL("DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_doubler`");
-       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE `action`='doubler' LIMIT 3");
-       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_guest_menu` WHERE `what`='doubler' LIMIT 1");
-       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_member_menu` WHERE `what`='doubler' LIMIT 1");
+       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE `action`='doubler'");
+       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_guest_menu` WHERE `what`='doubler'");
+       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_member_menu` WHERE `what`='doubler'");
        break;
 
 case "activate": // Do stuff when admin activates this extension

diff --git a/inc/extensions/ext-html_mail.php b/inc/extensions/ext-html_mail.php
index fc9de447c409bae3b1c2fcc645c0c22cf2f78391..9dd2d099ea8338e0de6823091a280e373159fb55 100644 (file)
--- a/inc/extensions/ext-html_mail.php
+++ b/inc/extensions/ext-html_mail.php
@@ -63,7 +63,7 @@ case "remove": // Do stuff when removing extension
        ADD_SQL("ALTER TABLE `{!_MYSQL_PREFIX!}_user_data` DROP html");
        ADD_SQL("ALTER TABLE `{!_MYSQL_PREFIX!}_bonus` DROP html_msg");
        ADD_SQL("ALTER TABLE `{!_MYSQL_PREFIX!}_pool` DROP html_msg");
-       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_member_menu` WHERE `what`='html_mail' LIMIT 1");
+       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_member_menu` WHERE `what`='html_mail'");
        break;
 
 case "activate": // Do stuff when admin activates this extension

diff --git a/inc/extensions/ext-logs.php b/inc/extensions/ext-logs.php
index 8099c4b424a52ad4c200548db84a75e3580cb668..34c56bc53f450481a7ecf7e75eb9c57fd7f727aa 100644 (file)
--- a/inc/extensions/ext-logs.php
+++ b/inc/extensions/ext-logs.php
@@ -58,7 +58,7 @@ case "register": // Do stuff when installation is running (modules.php?module=ad
 
 case "remove": // Do stuff when removing extension
        // SQL commands to run
-       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE `what`='logs' LIMIT 1");
+       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE `what`='logs'");
        break;
 
 case "activate": // Do stuff when admin activates this extension

diff --git a/inc/extensions/ext-maintenance.php b/inc/extensions/ext-maintenance.php
index 0aa42ad113359aae4aec6a91f0f298968d7243f6..2d5c8d7c45382b2ddf7b675c3362b6f2dcb3b524 100644 (file)
--- a/inc/extensions/ext-maintenance.php
+++ b/inc/extensions/ext-maintenance.php
@@ -58,7 +58,7 @@ case "register": // Do stuff when installation is running (modules.php?module=ad
 
 case "remove": // Do stuff when removing extension
        // SQL commands to run
-       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE `what`='maintenance' LIMIT 1");
+       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE `what`='maintenance'");
        break;
 
 case "activate": // Do stuff when admin activates this extension

diff --git a/inc/extensions/ext-mediadata.php b/inc/extensions/ext-mediadata.php
index d9147d1003ac996e79c0c58f608595c6e483e5ef..eb5df54436f6d6292d317d0822434c7733e16dc2 100644 (file)
--- a/inc/extensions/ext-mediadata.php
+++ b/inc/extensions/ext-mediadata.php
@@ -58,8 +58,8 @@ case "register": // Do stuff when installation is running (modules.php?module=ad
 case "remove": // Do stuff when removing extension
        // SQL commands to run
        ADD_SQL("DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_mediadata`");
-       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE `what`='config_mediadata' LIMIT 1");
-       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_guest_menu` WHERE `what`='mediadata' LIMIT 1");
+       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE `what`='config_mediadata'");
+       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_guest_menu` WHERE `what`='mediadata'");
        break;
 
 case "activate": // Do stuff when admin activates this extension

diff --git a/inc/extensions/ext-mods.php b/inc/extensions/ext-mods.php
index 2e969a917aa8fbe9ac0435deae3c00ef1b40cee8..19bfafd837990268d32f3bbd23086fdc3d6e88a2 100644 (file)
--- a/inc/extensions/ext-mods.php
+++ b/inc/extensions/ext-mods.php
@@ -59,7 +59,7 @@ case "register": // Do stuff when installation is running (modules.php?module=ad
 
 case "remove": // Do stuff when removing extension
        // SQL commands to run
-       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE `action`='mods' LIMIT 3");
+       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE `action`='mods'");
        break;
 
 case "activate": // Do stuff when admin activates this extension

diff --git a/inc/extensions/ext-newsletter.php b/inc/extensions/ext-newsletter.php
index ac8d48eb418b985a147fb003ec02948e515f5de8..0b24623f8a34c99de63d88102e1f2eeff774cdac 100644 (file)
--- a/inc/extensions/ext-newsletter.php
+++ b/inc/extensions/ext-newsletter.php
@@ -57,8 +57,8 @@ case "register": // Do stuff when installation is running (modules.php?module=ad
 
 case "remove": // Do stuff when removing extension
        // SQL commands to run
-       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE `action`='newsletter' AND what != 'send_newsletter' LIMIT 3");
-       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_member_menu` WHERE `what`='newsletter' LIMIT 1");
+       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE `action`='newsletter' AND what != 'send_newsletter'");
+       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_member_menu` WHERE `what`='newsletter'");
        break;
 
 case "activate": // Do stuff when admin activates this extension

diff --git a/inc/extensions/ext-nickname.php b/inc/extensions/ext-nickname.php
index 6f6632ef9933f7df1c85cd8561d9f9128aaac3de..b1957674938284554b2fd6bf012bdd02edad1e1a 100644 (file)
--- a/inc/extensions/ext-nickname.php
+++ b/inc/extensions/ext-nickname.php
@@ -59,8 +59,8 @@ case "register": // Do stuff when installation is running (modules.php?module=ad
 
 case "remove": // Do stuff when removing extension
        // SQL commands to run
-       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_member_menu` WHERE `what`='nickname' LIMIT 1");
-       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE what IN ('config_nickname','list_nickname') LIMIT 2");
+       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_member_menu` WHERE `what`='nickname'");
+       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE what IN ('config_nickname','list_nickname')");
        ADD_SQL("DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_nickname_history`");
        break;
 

diff --git a/inc/extensions/ext-online.php b/inc/extensions/ext-online.php
index 1aa02221628b61a503d6ace1922834d19464111c..9d87ada42d9b8a154f9ee422f340c4de123d114e 100644 (file)
--- a/inc/extensions/ext-online.php
+++ b/inc/extensions/ext-online.php
@@ -76,8 +76,8 @@ KEY `admin_member` (`is_admin`,`is_member`)
 case "remove": // Do stuff when removing extension
        // SQL commands to run
        ADD_SQL("DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_online`");
-       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE `what`='usr_online' LIMIT 1");
-       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_guest_menu` WHERE `action`='online' LIMIT 1");
+       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE `what`='usr_online'");
+       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_guest_menu` WHERE `action`='online'");
 
        // Unregister filter
        UNREGISTER_FILTER('init', 'UPDATE_ONLINE_LIST', true, $dry_run);

diff --git a/inc/extensions/ext-optimize.php b/inc/extensions/ext-optimize.php
index 97fc30939bc44b1345020193095fd86bec58a88f..5dd1f18341b6e170a9b9d699c2d2cee68235e1a7 100644 (file)
--- a/inc/extensions/ext-optimize.php
+++ b/inc/extensions/ext-optimize.php
@@ -63,7 +63,7 @@ case "register": // Do stuff when installation is running (modules.php?module=ad
 case "remove": // Do stuff when removing extension
        // SQL commands to run
        ADD_SQL("DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_optimize_gain`");
-       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE `what`='optimize' LIMIT 1");
+       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE `what`='optimize'");
        break;
 
 case "activate": // Do stuff when admin activates this extension

diff --git a/inc/extensions/ext-order.php b/inc/extensions/ext-order.php
index 9dca71ddcebc4cc70d8dd20e69ccac73fb39f89c..43fbadf439b982cab4bed0ce987e605acad9c50a 100644 (file)
--- a/inc/extensions/ext-order.php
+++ b/inc/extensions/ext-order.php
@@ -57,7 +57,7 @@ case "register": // Do stuff when installation is running (modules.php?module=ad
 
 case "remove": // Do stuff when removing extension
        // SQL commands to run
-       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE `what`='config_order' LIMIT 1");
+       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE `what`='config_order'");
        break;
 
 case "activate": // Do stuff when admin activates this extension

diff --git a/inc/extensions/ext-other.php b/inc/extensions/ext-other.php
index 5a97a870abec3d11664091aa294d57ba5375e9fb..99a94cb16e08357ee215fb6fd0427988c4dbe7fa 100644 (file)
--- a/inc/extensions/ext-other.php
+++ b/inc/extensions/ext-other.php
@@ -57,7 +57,7 @@ case "register": // Do stuff when installation is running (modules.php?module=ad
 
 case "remove": // Do stuff when removing extension
        // SQL commands to run
-       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE `what`='config_other' LIMIT 1");
+       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE `what`='config_other'");
        break;
 
 case "activate": // Do stuff when admin activates this extension

diff --git a/inc/extensions/ext-payout.php b/inc/extensions/ext-payout.php
index 55e3476a7e2fbce01e32195a19fea398a4d648ae..4b1f7d4e499a5794423884aa21edcc6448f6f515 100644 (file)
--- a/inc/extensions/ext-payout.php
+++ b/inc/extensions/ext-payout.php
@@ -84,7 +84,7 @@ case "remove": // Do stuff when removing extension
        ADD_SQL("DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_user_payouts`");
        ADD_SQL("DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_payout_types`");
        ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE `action`='payouts'");
-       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_member_menu` WHERE `what`='payout' LIMIT 1");
+       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_member_menu` WHERE `what`='payout'");
        break;
 
 case "activate": // Do stuff when admin activates this extension

diff --git a/inc/extensions/ext-primera.php b/inc/extensions/ext-primera.php
index 169ea946a60ead318946cbe3fef089ca1f5ec211..db02d3f7a85879094b3ca0bb2d107b0f2383811b 100644 (file)
--- a/inc/extensions/ext-primera.php
+++ b/inc/extensions/ext-primera.php
@@ -84,7 +84,7 @@ case "remove": // Do stuff when removing extension
        // SQL commands to run
        ADD_SQL("DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_user_primera`");
        ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE `action`='primera'");
-       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_member_menu` WHERE `what`='primera' LIMIT 1");
+       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_member_menu` WHERE `what`='primera'");
        break;
 
 case "activate": // Do stuff when admin activates this extension

diff --git a/inc/extensions/ext-rallye.php b/inc/extensions/ext-rallye.php
index 83fa1cf8d8ce41eb36dbb3aa3b982ba2f22c0340..336eb3a2ad5df2a7d744383af9445f30460db319 100644 (file)
--- a/inc/extensions/ext-rallye.php
+++ b/inc/extensions/ext-rallye.php
@@ -109,9 +109,9 @@ case "remove": // Do stuff when removing extension
        ADD_SQL("DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_rallye_users`");
 
        // Remove menus
-       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE `action`='rallye' LIMIT 4");
-       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_guest_menu` WHERE `what`='rallyes' LIMIT 1");
-       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_member_menu` WHERE `what`='rallyes' LIMIT 1");
+       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE `action`='rallye'");
+       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_guest_menu` WHERE `what`='rallyes'");
+       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_member_menu` WHERE `what`='rallyes'");
 
        // Unregister filter
        UNREGISTER_FILTER('extra_autopurge', 'RALLYE_EXTRA_AUTOPURGE', true, $dry_run);

diff --git a/inc/extensions/ext-refback.php b/inc/extensions/ext-refback.php
index 32aa44cf011b287955f34b0cdc372dcb20145384..8f5c9ba9854ec8de40ddc06722577d3c48539d58 100644 (file)
--- a/inc/extensions/ext-refback.php
+++ b/inc/extensions/ext-refback.php
@@ -71,8 +71,8 @@ KEY (`refid`)
 case "remove": // Do stuff when removing extension
        // SQL commands to run
        ADD_SQL("DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_user_refs`");
-       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_member_menu` WHERE `what`='refback' LIMIT 1");
-       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE what IN('config_refback','list_refback') LIMIT 2");
+       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_member_menu` WHERE `what`='refback'");
+       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE what IN('config_refback','list_refback')");
        ADD_SQL("UPDATE `{!_MYSQL_PREFIX!}_refsystem` SET level=level-1");
        break;
 

diff --git a/inc/extensions/ext-register.php b/inc/extensions/ext-register.php
index 947e997eebd48d51e16dfe61c5b11695e58e555e..823d9333236346a466231cc7239a380b11a9ffa2 100644 (file)
--- a/inc/extensions/ext-register.php
+++ b/inc/extensions/ext-register.php
@@ -57,7 +57,7 @@ case "register": // Do stuff when installation is running (modules.php?module=ad
 
 case "remove": // Do stuff when removing extension
        // SQL commands to run
-       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE `what`='config_register' LIMIT 1");
+       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE `what`='config_register'");
        break;
 
 case "activate": // Do stuff when admin activates this extension

diff --git a/inc/extensions/ext-removeip.php b/inc/extensions/ext-removeip.php
index 11b7f14983680e7378e6eafdca1a5f2d7041d8bf..1e0eb3611b03c3ede8da0fec5bb289347c65ab7c 100644 (file)
--- a/inc/extensions/ext-removeip.php
+++ b/inc/extensions/ext-removeip.php
@@ -66,7 +66,7 @@ case "register": // Do stuff when installation is running (modules.php?module=ad
 
 case "remove": // Do stuff when removing extension
        // SQL commands to run
-       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE `what`='config_removeip' LIMIT 1");
+       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE `what`='config_removeip'");
 
        // Remove filters
        UNREGISTER_FILTER('post_youhere_line', 'ADD_ANONYMITY_NOTICE', true, $dry_run);

diff --git a/inc/extensions/ext-repair.php b/inc/extensions/ext-repair.php
index 8a48615bd4bd24ad6d7b495063b30a271e2a0a6a..197f1a619217711f8aa0858269801a5a5a5b4045 100644 (file)
--- a/inc/extensions/ext-repair.php
+++ b/inc/extensions/ext-repair.php
@@ -58,7 +58,7 @@ case "register": // Do stuff when installation is running (modules.php?module=ad
 
 case "remove": // Do stuff when removing extension
        // SQL commands to run
-       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE `action`='repair' LIMIT 5");
+       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE `action`='repair'");
        break;
 
 case "activate": // Do stuff when admin activates this extension

diff --git a/inc/extensions/ext-rewrite.php b/inc/extensions/ext-rewrite.php
index 63f7076e9ded4938f4f6651ceeda00d3585ed8b1..28a8eca22f2e0d08f0e1841182896127bbd7421f 100644 (file)
--- a/inc/extensions/ext-rewrite.php
+++ b/inc/extensions/ext-rewrite.php
@@ -63,7 +63,7 @@ case "register": // Do stuff when installation is running (modules.php?module=ad
 
 case "remove": // Do stuff when removing extension
        // SQL commands to run
-       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE `what`='config_rewrite' LIMIT 1");
+       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE `what`='config_rewrite'");
        break;
 
 case "activate": // Do stuff when admin activates this extension

diff --git a/inc/extensions/ext-sponsor.php b/inc/extensions/ext-sponsor.php
index a3eca42a990ed4171b0c9209a7d4d56cea13f891..61a4fde77ee34581a0f1e3b8b9a187ed0f429a83 100644 (file)
--- a/inc/extensions/ext-sponsor.php
+++ b/inc/extensions/ext-sponsor.php
@@ -383,9 +383,9 @@ case "remove": // Do stuff when removing extension
        ADD_SQL("DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_sponsor_campaign_assigns`");
        ADD_SQL("DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_sponsor_admin_data`");
        ADD_SQL("DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_sponsor_display_data`");
-       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE `action`='sponsor' OR what IN('repr_sponsor','sponsor_medit','sponsor_madd') LIMIT 20");
-       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_guest_menu` WHERE `action`='sponsor' LIMIT 5");
-       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_member_menu` WHERE `what`='sponsor' LIMIT 1");
+       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE `action`='sponsor' OR what IN('repr_sponsor','sponsor_medit','sponsor_madd')");
+       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_guest_menu` WHERE `action`='sponsor'");
+       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_member_menu` WHERE `what`='sponsor'");
        break;
 
 case "activate": // Do stuff when admin activates this extension

diff --git a/inc/extensions/ext-sql_patches.php b/inc/extensions/ext-sql_patches.php
index e6b870aa4d6e481f9f11d70ad8e0f9b74e5b3e0f..3dc39325bdc150da78b6826f7e16e16cd0b0dfb7 100644 (file)
--- a/inc/extensions/ext-sql_patches.php
+++ b/inc/extensions/ext-sql_patches.php
@@ -93,6 +93,7 @@ action='rals' OR
 action='account'");
 
        // Drop indexes
+       /* @TODO SQL_ALTER_TABLE() should work now properly
        ADD_SQL("ALTER TABLE `{!_MYSQL_PREFIX!}_extensions` DROP UNIQUE KEY `ext_name`");
        ADD_SQL("ALTER TABLE `{!_MYSQL_PREFIX!}_admins` DROP UNIQUE KEY `login`");
        ADD_SQL("ALTER TABLE `{!_MYSQL_PREFIX!}_user_data` DROP INDEX `status`");
@@ -124,6 +125,7 @@ action='account'");
        ADD_SQL("ALTER TABLE `{!_MYSQL_PREFIX!}_member_menu` DROP INDEX `locked`");
        ADD_SQL("ALTER TABLE `{!_MYSQL_PREFIX!}_cats` DROP INDEX `visible`");
        ADD_SQL("ALTER TABLE `{!_MYSQL_PREFIX!}_cats` DROP INDEX `sort`");
+       */
        break;
 
 case "activate": // Do stuff when admin activates this extension

diff --git a/inc/extensions/ext-surfbar.php b/inc/extensions/ext-surfbar.php
index 2d02c54206bbac50452ff6ba2832d12c0bcc1fd7..e84a1a708d501691dc5fb108b607f1792102e7da 100644 (file)
--- a/inc/extensions/ext-surfbar.php
+++ b/inc/extensions/ext-surfbar.php
@@ -200,8 +200,8 @@ case "remove": // Do stuff when removing extension
        ADD_SQL("DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_surfbar_salts`");
        ADD_SQL("DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_surfbar_stats`");
        ADD_SQL("DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_surfbar_urls`");
-       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_member_menu` WHERE `action`='surfbar' LIMIT 5");
-       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE `action`='surfbar' LIMIT 7");
+       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_member_menu` WHERE `action`='surfbar'");
+       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE `action`='surfbar'");
        break;
 
 case "activate": // Do stuff when admin activates this extension

diff --git a/inc/extensions/ext-task.php b/inc/extensions/ext-task.php
index ced2cc5ac11049ee9a9b886c5f42cd17e8560571..6ddbc4234e1744aaa929b0ba5adf48642ba5f5ce 100644 (file)
--- a/inc/extensions/ext-task.php
+++ b/inc/extensions/ext-task.php
@@ -59,7 +59,7 @@ case "register": // Do stuff when installation is running (modules.php?module=ad
 
 case "remove": // Do stuff when removing extension
        // SQL commands to run
-       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE `action`='task' LIMIT 2");
+       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE `action`='task'");
        break;
 
 case "activate": // Do stuff when admin activates this extension

diff --git a/inc/extensions/ext-theme.php b/inc/extensions/ext-theme.php
index 6de24ad2bfcc9361d2255b8263e0cb73347a93d0..ae9421a980fa84041aa69d413cc0e725736715f5 100644 (file)
--- a/inc/extensions/ext-theme.php
+++ b/inc/extensions/ext-theme.php
@@ -59,13 +59,13 @@ case "remove": // Do stuff when removing extension
        ADD_SQL("DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_themes`");
 
        // Delete admin menu
-       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE `action`='theme' LIMIT 4");
+       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE `action`='theme'");
 
        // Delete guest menu entries
-       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_guest_menu` WHERE `action`='themes' LIMIT 1");
+       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_guest_menu` WHERE `action`='themes'");
 
        // Delete member menu entries
-       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_member_menu` WHERE `action`='themes' OR `what`='themes' LIMIT 2");
+       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_member_menu` WHERE `action`='themes' OR `what`='themes'");
        break;
 
 case "activate": // Do stuff when admin activates this extension

diff --git a/inc/extensions/ext-top10.php b/inc/extensions/ext-top10.php
index b31a07f5add91e6a2a7bca368a5d30111654ce26..f0ebdd9b270b75ae00bea71261bd92c3c9b49808 100644 (file)
--- a/inc/extensions/ext-top10.php
+++ b/inc/extensions/ext-top10.php
@@ -59,8 +59,8 @@ case "register": // Do stuff when installation is running (modules.php?module=ad
 
 case "remove": // Do stuff when removing extension
        // SQL commands to run
-       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_guest_menu` WHERE `what`='top10' LIMIT 1");
-       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE `what`='config_top10' LIMIT 1");
+       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_guest_menu` WHERE `what`='top10'");
+       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE `what`='config_top10'");
        break;
 
 case "activate": // Do stuff when admin activates this extension

diff --git a/inc/extensions/ext-transfer.php b/inc/extensions/ext-transfer.php
index 55dec050cf3ef79ad16299a5a89f250713d440bc..2bbb4818f0773fbcde528b2a4bf3828b965c3e5f 100644 (file)
--- a/inc/extensions/ext-transfer.php
+++ b/inc/extensions/ext-transfer.php
@@ -107,9 +107,9 @@ case "remove": // Do stuff when removing extension
        // SQL commands to run
        ADD_SQL("DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_user_transfers_in`");
        ADD_SQL("DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_user_transfers_out`");
-       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE `action`='transfer' LIMIT 4");
-       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_member_menu` WHERE `what`='transfer' LIMIT 1");
-       ADD_SQL("ALTER TABLE `{!_MYSQL_PREFIX!}_user_data` DROP opt_in");
+       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE `action`='transfer'");
+       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_member_menu` WHERE `what`='transfer'");
+       ADD_SQL("ALTER TABLE `{!_MYSQL_PREFIX!}_user_data` DROP `opt_in`");
        break;
 
 case "activate": // Do stuff when admin activates this extension

diff --git a/inc/extensions/ext-usage.php b/inc/extensions/ext-usage.php
index 1547c4aa70aeb05788165bda7729b9f6bbdf06af..035f5cc3be802fa72addf88a608df21ce746c96b 100644 (file)
--- a/inc/extensions/ext-usage.php
+++ b/inc/extensions/ext-usage.php
@@ -58,7 +58,7 @@ case "register": // Do stuff when installation is running (modules.php?module=ad
 
 case "remove": // Do stuff when removing extension
        // SQL commands to run
-       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE `what`='usage' LIMIT 1");
+       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE `what`='usage'");
        break;
 
 case "activate": // Do stuff when admin activates this extension

diff --git a/inc/extensions/ext-user.php b/inc/extensions/ext-user.php
index 53495b76c836d85b7c2cc0b54da418d82016cea6..b75d24da398456ed8f43d0097ed3766b41925beb 100644 (file)
--- a/inc/extensions/ext-user.php
+++ b/inc/extensions/ext-user.php
@@ -66,7 +66,7 @@ case "register": // Do stuff when installation is running (modules.php?module=ad
 
 case "remove": // Do stuff when removing extension
        // SQL commands to run
-       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE `what` IN('config_user','user_contct','list_user_del') LIMIT 3");
+       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE `what` IN('config_user','user_contct','list_user_del') OR `action`='user'");
        ADD_SQL("DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_user_del`");
        break;
 

diff --git a/inc/extensions/ext-wernis.php b/inc/extensions/ext-wernis.php
index db288ccae6e424a9f00f016bb480a371c128d615..76c1663dcd8f1e30f3e739412538c904c3a97cbc 100644 (file)
--- a/inc/extensions/ext-wernis.php
+++ b/inc/extensions/ext-wernis.php
@@ -87,8 +87,8 @@ case "remove": // Do stuff when removing extension
        // SQL commands to run
        ADD_SQL("DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_user_wernis`");
        ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE `action`='wernis'");
-       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_member_menu` WHERE `what`='wernis' LIMIT 1");
-       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_guest_menu` WHERE `what`='wernis_portal' LIMIT 1");
+       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_member_menu` WHERE `what`='wernis'");
+       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_guest_menu` WHERE `what`='wernis_portal'");
        break;
 
 case "activate": // Do stuff when admin activates this extension

diff --git a/inc/extensions/ext-yoomedia.php b/inc/extensions/ext-yoomedia.php
index 92acaf61a72cf04753f73f550f02d051c0d419c5..54171376a0340c951343a6ecf70222a68c993319 100644 (file)
--- a/inc/extensions/ext-yoomedia.php
+++ b/inc/extensions/ext-yoomedia.php
@@ -86,7 +86,7 @@ UNIQUE `y_type` (`type`,`y_id`)
 
 case "remove": // Do stuff when removing extension
        // SQL commands to run
-       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE `what` IN('config_yoomedia','list_yoomedia_tm') LIMIT 2");
+       ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE `what` IN('config_yoomedia','list_yoomedia_tm')");
        ADD_SQL("DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_yoomedia_reload`");
        break;
 

diff --git a/inc/install-inc.php b/inc/install-inc.php
index 2cc38fa24df4b8bf9a36dd1c13d109eda82b916d..06c7e1fc7254850ff79c083762040896254a7ce3 100644 (file)
--- a/inc/install-inc.php
+++ b/inc/install-inc.php
@@ -47,7 +47,7 @@ if (!defined('__SECURITY')) {
 }
 
 // Init variables
-$mysql = "";
+$mysql = array();
 if ((REQUEST_ISSET_POST(('mysql'))) && (is_array(REQUEST_POST('mysql')))) $mysql = REQUEST_POST('mysql');
 
 // Check if both passwords from SMTP are matching

diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php
index bd0d9351cda330bf0edc4b1e3631d1970558afa1..d668fbaacd7d4447dedffe3820c367fc7cff8fe4 100644 (file)
--- a/inc/modules/admin/admin-inc.php
+++ b/inc/modules/admin/admin-inc.php
@@ -1251,6 +1251,16 @@ function ADMIN_DELETE_TASK ($id) {
 }
 // Function to update task data
 function ADMIN_UPDATE_TASK_DATA ($id, $row, $data) {
+       // Is the id not set, then we need a backtrace here... :(
+       if ($id <= 0) {
+               // Initiate backtrace
+               debug_report_bug(sprintf("id is invalid: %s. row=%s, data=%s",
+                       $id,
+                       $row,
+                       $data
+               ));
+       } // END - if
+
        // Update the task
        SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_task_system` SET %s='%s' WHERE id=%s LIMIT 1",
                array($row, $data, bigintval($id)), __FUNCTION__, __LINE__);