MyISAM/InnoDB support added

[mailer.git] / inc / extensions / ext-sql_patches.php

diff --git a/inc/extensions/ext-sql_patches.php b/inc/extensions/ext-sql_patches.php
index b6e9fb8665b0ffc15db2f2729119eda2c0e1d7bd..fa7969499b578338f71b297f96fde09bfbdd62d5 100644 (file)
--- a/inc/extensions/ext-sql_patches.php
+++ b/inc/extensions/ext-sql_patches.php
@@ -416,7 +416,7 @@ INDEX (la_id),
 INDEX (la_action),
 INDEX (la_what),
 PRIMARY KEY(id)
-) TYPE=MyISAM");
+) TYPE={!_TABLE_TYPE!}");
                // All "logical areas" together
                ADD_SQL("DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_admin_menu_las`_data");
                ADD_SQL("CREATE TABLE `{!_MYSQL_PREFIX!}_admin_menu_las`_data (
@@ -429,7 +429,7 @@ UNIQUE KEY (la_id),
 INDEX (la_posx),
 INDEX (la_posy),
 PRIMARY KEY(id)
-) TYPE=MyISAM");
+) TYPE={!_TABLE_TYPE!}");
                // Which menu do you like?
                ADD_SQL("ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD admin_menu ENUM('NEW','OLD') NOT NULL DEFAULT 'OLD'");
 
@@ -453,7 +453,7 @@ type ENUM('la','action','what') NOT NULL DEFAULT 'what',
 clicks BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 INDEX (aid),
 PRIMARY KEY (id)
-) TYPE=MyISAM");
+) TYPE={!_TABLE_TYPE!}");
 
                // Update notes (these will be set as task text!)
                EXT_SET_UPDATE_NOTES("Admin-abhängig werden nun Klicks im Admin-Menü gezählt, die zur automatischen Anpassung des Menüs in den logischen Bereichen diennen. Dieses "intelligente Unbauen" können Sie auch ganz abschalten.");
@@ -662,7 +662,7 @@ PRIMARY KEY (id)
 PRIMARY KEY(`id`),
 INDEX (`userid`),
 INDEX (`stats_type`)
-) TYPE=MyISAM COMMENT='Member statistics data'");
+) TYPE={!_TABLE_TYPE!} COMMENT='Member statistics data'");
 
                // Update notes (these will be set as task text!)
                EXT_SET_UPDATE_NOTES("Mitglieder könnnen nun z.B. in den Mail-Details zu jeder Mail sehen, wann sie diese bestätigt haben. Die neue Statistik-Tabelle ist aber universell einsetzbar.");
@@ -690,7 +690,7 @@ INDEX (`stats_type`)
 `filter_function` VARCHAR(255) NOT NULL DEFAULT '',
 `filter_active` ENUM('N','Y') NOT NULL DEFAULT 'Y',
 PRIMARY KEY (`filter_id`)
-) TYPE=MyISAM COMMENT='Filter system'");
+) TYPE={!_TABLE_TYPE!} COMMENT='Filter system'");
                ADD_SQL("INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','list_filter','Filter-Management', 'Zeigt alle im System registrierten Filter an und lässt diese de- bzw. wieder aktivieren.', 17)");
 
                // Update notes (these will be set as task text!)
@@ -741,7 +741,7 @@ default: // Do stuff when extension is loaded
                        LOAD_INC_ONCE("inc/gen_sql_patches.php");
 
                        // @TODO Rewrite this to a filter!
-                       if ((GET_EXT_VERSION("cache") >= "0.1.2") && (isset($GLOBALS['cache_instance'])) && (is_object($GLOBALS['cache_instance']))) {
+                       if ((GET_EXT_VERSION("cache") >= "0.1.2") && (isCacheInstanceValid())) {
                                // Remove extensions and mod_reg cache file
                                LOAD_INC_ONCE("inc/libs/cache_functions.php");
                                require(sprintf("%sinc/extensions/ext-cache.php", constant('PATH')));