Fixes for rewrite extension (thx 2 monakoianar again)

diff --git a/inc/extensions/ext-rewrite.php b/inc/extensions/ext-rewrite.php
index f162c6469ce2fb68177c88f824946be1952600ba..c38ca09194ca668ac238bb24df572845ba415e05 100644 (file)
--- a/inc/extensions/ext-rewrite.php
+++ b/inc/extensions/ext-rewrite.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
  * MXChange v0.2.1                                    Start: 10/24/2004 *
 <?php
 /************************************************************************
  * MXChange v0.2.1                                    Start: 10/24/2004 *

- * ================                             Last change: 10/29/2004 *
+ * ================                             Last change: 08/28/2008 *

  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : ext-rewrite.php                                  *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : ext-rewrite.php                                  *

diff --git a/inc/libs/rewrite_functions.php b/inc/libs/rewrite_functions.php
index e282612b4bff31b5652fc1cddc8f5fba6796a9c1..308b42da68ec462cf5ff66e39e2341c2dd36be69 100644 (file)
--- a/inc/libs/rewrite_functions.php
+++ b/inc/libs/rewrite_functions.php
@@ -44,7 +44,7 @@ function REWRITE_LINKS($HTML)
        global $_CONFIG;
 
        // Skip rewriting for the admin area (which search engine may enter here???)
        global $_CONFIG;
 
        // Skip rewriting for the admin area (which search engine may enter here???)

-       if (ereg($GLOBALS['module'], $_CONFIG['rewrite_skipped_mods'])) return $HTML;
+       if (ereg($GLOBALS['module'], $_CONFIG['rewrite_skip'])) return $HTML;

 
        // Strip slashes with double-backslashes for the preg_replace() function
        $URL = str_replace("/", "\\/", URL);
 
        // Strip slashes with double-backslashes for the preg_replace() function
        $URL = str_replace("/", "\\/", URL);

diff --git a/inc/modules/admin/what-config_rewrite.php b/inc/modules/admin/what-config_rewrite.php
index b9276d55771dc5f665c6ec3e0fc07af43710bb87..f02d461c2c79d3a3138a5c1b0e1091ce39081e63 100644 (file)
--- a/inc/modules/admin/what-config_rewrite.php
+++ b/inc/modules/admin/what-config_rewrite.php
@@ -72,7 +72,7 @@ if (isset($_POST['ok']))
                if (empty($title)) $title = "---";
 
                // Already registered module?
                if (empty($title)) $title = "---";
 
                // Already registered module?

-               if (ereg($mod, $_CONFIG['rewrite_skipped_mods']))
+               if (ereg($mod, $_CONFIG['rewrite_skip']))

                {
                        // Found
                        $y = ' checked';
                {
                        // Found
                        $y = ' checked';

diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index f11a84bf7493969c8533f933f211cb52f77fbb37..23a57e582182a58258895cb6a94ecb91aa3dae20 100644 (file)
--- a/inc/mysql-manager.php
+++ b/inc/mysql-manager.php
@@ -1522,8 +1522,10 @@ function LOAD_CONFIG($no="0")
                        $CFG_DUMMY[$key] = $value;
                }
 
                        $CFG_DUMMY[$key] = $value;
                }
 

-               // Count cache hits
-               $CFG_DUMMY['cache_hits']++;
+               // Count cache hits if exists
+               if ((isset($CFG_DUMMY['cache_hits'])) && (EXT_IS_ACTIVE("cache"))) {
+                       $CFG_DUMMY['cache_hits']++;
+               } // END - if

        } else {
                // Load config from DB
                $result_config = SQL_QUERY_ESC("SELECT * FROM "._MYSQL_PREFIX."_config WHERE config=%d LIMIT 1",
        } else {
                // Load config from DB
                $result_config = SQL_QUERY_ESC("SELECT * FROM "._MYSQL_PREFIX."_config WHERE config=%d LIMIT 1",