X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fgen_sql_patches.php;h=b2b984b4e59cb36d146d06ce7fecc76eee3d6c38;hb=33a76a20bc94ffe95e9f13906eb7dc5cf354948d;hp=4d8431671f0ae69ddcb72f8b750f63cb4d0e2dd2;hpb=8cef2a4631919672cbbfd484f6e198e1f21b087d;p=mailer.git

diff --git a/inc/gen_sql_patches.php b/inc/gen_sql_patches.php
index 4d8431671f..b2b984b4e5 100644
--- a/inc/gen_sql_patches.php
+++ b/inc/gen_sql_patches.php
@@ -16,8 +16,8 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -65,10 +65,10 @@ if (getMasterSalt() == '') {
 	unset($masterSalt);
 } // END - if
 
-if (getFileHash() == '') {
+if ((getFileHash() == '') || (!isFileReadable(getPath() . getCachePath() . '.' . getFileHash() . '.cache'))) {
 	// Create filename from hashed random string
 	$fileHash = sha1(generatePassword(mt_rand(128, 256)));
-	$FQFN = sprintf("%s%s.%s.cache",
+	$FQFN = sprintf('%s%s.%s.cache',
 		getPath(),
 		getCachePath(),
 		$fileHash
@@ -84,7 +84,9 @@ if (getFileHash() == '') {
 	if (isFileReadable($FQFN)) {
 		// Also update configuration
 		setConfigEntry('secret_key', $secretKey);
-		updateConfiguration('file_hash', $fileHash);
+
+		// Force update
+		updateConfiguration('file_hash', $fileHash, '', '0', TRUE);
 
 		// Remove variables
 		unset($secretKey);
@@ -93,11 +95,12 @@ if (getFileHash() == '') {
 } // END - if
 
 // @TODO Rewrite this to a filter
-if ((isExtensionInstalledAndNewer('cache', '0.1.2')) && (isCacheInstanceValid())) {
+if ((isExtensionInstalledAndNewer('cache', '0.1.2')) && (isValidCacheInstance())) {
 	// Destroy some cache files
-	if ($GLOBALS['cache_instance']->loadCacheFile('config'))    $GLOBALS['cache_instance']->removeCacheFile();
-	if ($GLOBALS['cache_instance']->loadCacheFile('extension')) $GLOBALS['cache_instance']->removeCacheFile();
-	if ($GLOBALS['cache_instance']->loadCacheFile('modules'))   $GLOBALS['cache_instance']->removeCacheFile();
+	foreach (array('config', 'extension', 'filter', 'modules') as $cache) {
+		// Use rebuildCache()
+		rebuildCache($cache);
+	} // END - foreach
 } // END - if
 
 // [EOF]