X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fgen_sql_patches.php;h=1e3f278d58127d0c9418dd1fe310293b86a2bd0d;hb=ab5ff5126ef56b08f5130a9e110b53c00d0a2761;hp=24bd20b76f0851532d4f571faa5e6a2883d9f707;hpb=c3b4eaf29946349ff058691db2dcb615a5379bb2;p=mailer.git

diff --git a/inc/gen_sql_patches.php b/inc/gen_sql_patches.php
index 24bd20b76f..1e3f278d58 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 - 2011 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,13 +65,14 @@ if (getMasterSalt() == '') {
 	unset($masterSalt);
 } // END - if
 
-if (getFileHash() == '') {
+if ((getFileHash() == '') || (!isFileReadable(getGenericHashFileName()))) {
 	// Create filename from hashed random string
 	$fileHash = sha1(generatePassword(mt_rand(128, 256)));
-	$FQFN = sprintf("%s%s.%s.cache",
+	$FQFN = sprintf('%s%s.%s%s',
 		getPath(),
 		getCachePath(),
-		$fileHash
+		$fileHash,
+		getCacheExtension()
 	);
 
 	// Generate secret key from a randomized string
@@ -84,7 +85,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 +96,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]