Patch for patch-system... ;-)

[mailer.git] / inc / patch-system.php

diff --git a/inc/patch-system.php b/inc/patch-system.php
index 984103c8b0ae3aee42d46a4cc93fd407620a1de8..37de0712551f64179a8bd09864f89ab35121fb0c 100644 (file)
--- a/inc/patch-system.php
+++ b/inc/patch-system.php
@@ -32,32 +32,18 @@
  ************************************************************************/
 
 // Some security stuff...
-if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
-{
+if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
 }
 
 // Check for patch level differences between databases and current hard-coded
-if (CURR_PATCH_LEVEL > $_CONFIG['patch_level'])
-{
+if ((CURR_SVN_REVISION > $_CONFIG['patch_level']) || ($_CONFIG['patch_level'] == "CURR_SVN_REVISION") || ($_CONFIG['patch_ctime'] == "UNIX_TIMES")) {
        // Update database and CONFIG array
-       $result = SQL_QUERY("UPDATE "._MYSQL_PREFIX."_config SET patch_level='".CURR_PATCH_LEVEL."', patch_ctime=UNIX_TIMESTAMP() WHERE config=0 LIMIT 1",
-        __FILE__, __LINE__);
-       $_CONFIG['patch_level'] = CURR_PATCH_LEVEL;
+       UPDATE_CONFIG(array("patch_level", "patch_ctime"), array(CURR_SVN_REVISION, "UNIX_TIMESTAMP()"));
+       $_CONFIG['patch_level'] = CURR_SVN_REVISION;
        $_CONFIG['patch_ctime'] = time();
-
-       // Destroy cache
-       if (GET_EXT_VERSION("cache") >= "0.1.2")
-       {
-               if ($cacheInstance->cache_file("config", true))
-               {
-                       // Replace data
-                       $cacheInstance->cache_replace("patch_level", $_CONFIG['patch_level'], "0", $cacheArray);
-                       $cacheInstance->cache_replace("patch_ctime", $_CONFIG['patch_ctime'], "0", $cacheArray);
-               }
-       }
-}
+} // END - if
 
 //
 ?>