Many rewrites to get rid of dublicate modreg inserts while ext-cache is registered

[mailer.git] / inc / extensions.php

diff --git a/inc/extensions.php b/inc/extensions.php
index 5f3a704895bc1a7588896fdbecb018a6e5c2158b..93f6fa192a254236a2f76f7a17f82019090b95b8 100644 (file)
--- a/inc/extensions.php
+++ b/inc/extensions.php
@@ -442,7 +442,7 @@ function EXT_IS_ACTIVE ($ext_name) {
        } elseif (($ext_name == 'cache') || (GET_EXT_VERSION('cache') == '')) {
                //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "DB! ext_name={$ext_name}");
                // Load from database
-               $result = SQL_QUERY_ESC("SELECT ext_active FROM `{!_MYSQL_PREFIX!}_extensions` WHERE `ext_name`='%s' LIMIT 1",
+               $result = SQL_QUERY_ESC("SELECT `ext_active` FROM `{!_MYSQL_PREFIX!}_extensions` WHERE `ext_name`='%s' LIMIT 1",
                        array($ext_name), __FUNCTION__, __LINE__);
 
                // Entry found?
@@ -464,7 +464,7 @@ function EXT_IS_ACTIVE ($ext_name) {
        }
 
        // Debug message
-       //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, " ext_name={$ext_name},active={$active}");
+       //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "ext_name={$ext_name},active={$active}");
 
        // Is this extension activated? (For admins we always have active extensions...)
        return ($active == 'Y');
@@ -494,7 +494,7 @@ function GET_EXT_VERSION ($ext_name) {
                incrementConfigEntry('cache_hits');
        } elseif (!isCacheInstanceValid()) {
                // Load from database
-               $result = SQL_QUERY_ESC("SELECT ext_version FROM `{!_MYSQL_PREFIX!}_extensions` WHERE `ext_name`='%s' LIMIT 1",
+               $result = SQL_QUERY_ESC("SELECT `ext_version` FROM `{!_MYSQL_PREFIX!}_extensions` WHERE `ext_name`='%s' LIMIT 1",
                        array($ext_name), __FUNCTION__, __LINE__);
                //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, ": DB - ".SQL_NUMROWS($result)."");