Fixes for broken extension loader and language error. Resolves #87/#88

[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 2c3ef53d4f9f0bda50a308c44bdff3c6332b5a0f..fb72b89c8bfe852b55c20758540da4113090c909 100644 (file)
--- a/inc/extensions/ext-sql_patches.php
+++ b/inc/extensions/ext-sql_patches.php
@@ -600,7 +600,7 @@ PRIMARY KEY (id)
 
        case "0.4.9": // SQL queries for v0.4.9
                $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_user_data` CHANGE `user_hash` `user_hash` VARCHAR(255) NULL DEFAULT NULL";
-               $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_user_data` SET user_hash=NULL WHERE user_hash IS NOT NULL AND status='CONFIRMED'";
+               $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_user_data` SET user_hash=NULL WHERE user_hash IS NOT NULL AND `status`='CONFIRMED'";
                $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_user_data` ADD UNIQUE (`user_hash`)";
 
                // Update notes (these will be set as task text!)
@@ -741,7 +741,7 @@ default: // Do stuff when extension is loaded
                        if ((GET_EXT_VERSION("cache") >= "0.1.2") && (isset($cacheInstance)) && (is_object($cacheInstance))) {
                                // Remove extensions and mod_reg cache file
                                LOAD_INC_ONCE("inc/libs/cache_functions.php");
-                               LOAD_INC_ONCE("inc/extensions/ext-cache.php");
+                               require(sprintf("%sinc/extensions/ext-cache.php", constant('PATH')));
                                if ($cacheInstance->loadCacheFile("extensions", true)) $cacheInstance->destroyCacheFile();
                                if ($cacheInstance->loadCacheFile("mod_reg"))          $cacheInstance->destroyCacheFile();
                        } // END - if