Fix for 'array-to-string-conversion' bug in request-functions.php

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

diff --git a/inc/patch-system.php b/inc/patch-system.php
index 1e26908232233e1983124f02f037aaf3496058f5..e36a18adb1723e4058d4c2886e5c2941947bf9dc 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 ((constant('CURR_SVN_REVISION') > getConfig('patch_level')) || (getConfig('patch_level') == "CURR_SVN_REVISION") || (getConfig('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;
-       $_CONFIG['patch_ctime'] = time();
-
-       // Destroy cache
-       if (GET_EXT_VERSION("cache") >= "0.1.2")
-       {
-               if ($CACHE->cache_file("config", true))
-               {
-                       // Replace data
-                       $CACHE->cache_replace("patch_level", $_CONFIG['patch_level'], "0", $CFG_CACHE);
-                       $CACHE->cache_replace("patch_ctime", $_CONFIG['patch_ctime'], "0", $CFG_CACHE);
-               }
-       }
-}
+       UPDATE_CONFIG(array("patch_level", "patch_ctime"), array(constant('CURR_SVN_REVISION'), "UNIX_TIMESTAMP()"));
+       setConfigEntry('patch_level', constant('CURR_SVN_REVISION'));
+       setConfigEntry('patch_ctime', time());
+} // END - if
 
 //
 ?>