X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fextensions%2Fext-cache.php;h=4d0497e82d1ddf61f6a5a360070963c627773f07;hb=5b03d5ffe136bbb92efad7d18fdb1d91a611eee5;hp=3ca4e06017f8abb1f2664f9024194b944e5ae194;hpb=09f5758c42a33a56bdd461c946ffe759a59c54aa;p=mailer.git

diff --git a/inc/extensions/ext-cache.php b/inc/extensions/ext-cache.php
index 3ca4e06017..4d0497e82d 100644
--- a/inc/extensions/ext-cache.php
+++ b/inc/extensions/ext-cache.php
@@ -62,15 +62,15 @@ switch (getExtensionMode()) {
 		addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE `what` IN('cache_stats','config_config')");
 
 		// Unregister all filters
-		unregisterFilter('extension_update', 'CACHE_DESTROY_ON_EXT_CHANGE', true, getExtensionDryRun());
-		unregisterFilter('post_extension_installed', 'CACHE_DESTROY_ON_EXT_CHANGE', true, getExtensionDryRun());
-		unregisterFilter('post_extension_run_sql', 'CACHE_DESTROY_ON_EXT_CHANGE', true, getExtensionDryRun());
-		unregisterFilter('post_admin_added', 'CACHE_DESTROY_ON_ADMIN_CHANGE', true, getExtensionDryRun());
-		unregisterFilter('post_admin_edited', 'CACHE_DESTROY_ON_ADMIN_CHANGE', true, getExtensionDryRun());
-		unregisterFilter('post_admin_deleted', 'CACHE_DESTROY_ON_ADMIN_CHANGE', true, getExtensionDryRun());
-		unregisterFilter('post_admin_reset_pass', 'CACHE_DESTROY_ON_ADMIN_CHANGE', true, getExtensionDryRun());
-		unregisterFilter('extension_remove', 'CACHE_DESTROY_ALL', true, getExtensionDryRun());
-		unregisterFilter('shutdown', 'CACHE_DESTROY_FILTER', true, getExtensionDryRun());
+		unregisterFilter(__FUNCTION__, __LINE__, 'extension_update', 'CACHE_DESTROY_ON_EXT_CHANGE', true, isExtensionDryRun());
+		unregisterFilter(__FUNCTION__, __LINE__, 'post_extension_installed', 'CACHE_DESTROY_ON_EXT_CHANGE', true, isExtensionDryRun());
+		unregisterFilter(__FUNCTION__, __LINE__, 'post_extension_run_sql', 'CACHE_DESTROY_ON_EXT_CHANGE', true, isExtensionDryRun());
+		unregisterFilter(__FUNCTION__, __LINE__, 'post_admin_added', 'CACHE_DESTROY_ON_ADMIN_CHANGE', true, isExtensionDryRun());
+		unregisterFilter(__FUNCTION__, __LINE__, 'post_admin_edited', 'CACHE_DESTROY_ON_ADMIN_CHANGE', true, isExtensionDryRun());
+		unregisterFilter(__FUNCTION__, __LINE__, 'post_admin_deleted', 'CACHE_DESTROY_ON_ADMIN_CHANGE', true, isExtensionDryRun());
+		unregisterFilter(__FUNCTION__, __LINE__, 'post_admin_reset_pass', 'CACHE_DESTROY_ON_ADMIN_CHANGE', true, isExtensionDryRun());
+		unregisterFilter(__FUNCTION__, __LINE__, 'extension_remove', 'CACHE_DESTROY_ALL', true, isExtensionDryRun());
+		unregisterFilter(__FUNCTION__, __LINE__, 'shutdown', 'CACHE_DESTROY_FILTER', true, isExtensionDryRun());
 		break;
 
 	case 'activate': // Do stuff when admin activates this extension
@@ -201,14 +201,14 @@ switch (getExtensionMode()) {
 
 			case '0.2.1': // SQL queries for v0.2.1
 				// Register the new filter
-				registerFilter('extension_update', 'CACHE_DESTROY_ON_EXT_CHANGE', false, true, getExtensionDryRun());
-				registerFilter('post_extension_installed', 'CACHE_DESTROY_ON_EXT_CHANGE', false, true, getExtensionDryRun());
-				registerFilter('post_extension_run_sql', 'CACHE_DESTROY_ON_EXT_CHANGE', false, true, getExtensionDryRun());
-				registerFilter('post_admin_added', 'CACHE_DESTROY_ON_ADMIN_CHANGE', false, true, getExtensionDryRun());
-				registerFilter('post_admin_edited', 'CACHE_DESTROY_ON_ADMIN_CHANGE', false, true, getExtensionDryRun());
-				registerFilter('post_admin_deleted', 'CACHE_DESTROY_ON_ADMIN_CHANGE', false, true, getExtensionDryRun());
-				registerFilter('post_admin_reset_pass', 'CACHE_DESTROY_ON_ADMIN_CHANGE', false, true, getExtensionDryRun());
-				registerFilter('extension_remove', 'CACHE_DESTROY_ALL', false, true, getExtensionDryRun());
+				registerFilter('extension_update', 'CACHE_DESTROY_ON_EXT_CHANGE', false, true, isExtensionDryRun());
+				registerFilter('post_extension_installed', 'CACHE_DESTROY_ON_EXT_CHANGE', false, true, isExtensionDryRun());
+				registerFilter('post_extension_run_sql', 'CACHE_DESTROY_ON_EXT_CHANGE', false, true, isExtensionDryRun());
+				registerFilter('post_admin_added', 'CACHE_DESTROY_ON_ADMIN_CHANGE', false, true, isExtensionDryRun());
+				registerFilter('post_admin_edited', 'CACHE_DESTROY_ON_ADMIN_CHANGE', false, true, isExtensionDryRun());
+				registerFilter('post_admin_deleted', 'CACHE_DESTROY_ON_ADMIN_CHANGE', false, true, isExtensionDryRun());
+				registerFilter('post_admin_reset_pass', 'CACHE_DESTROY_ON_ADMIN_CHANGE', false, true, isExtensionDryRun());
+				registerFilter('extension_remove', 'CACHE_DESTROY_ALL', false, true, isExtensionDryRun());
 
 				// Update notes (these will be set as task text!)
 				setExtensionUpdateNotes("Filter für Erweiterungsmanagement hinzugefügt.");
@@ -226,7 +226,7 @@ switch (getExtensionMode()) {
 				setExtensionUpdateNotes("Cachen von Filtern hinzugefügt.");
 
 				// Register a new filter
-				registerFilter('shutdown', 'CACHE_DESTROY_FILTER', false, true, getExtensionDryRun());
+				registerFilter('shutdown', 'CACHE_DESTROY_FILTER', false, true, isExtensionDryRun());
 				break;
 
 			case '0.2.4': // SQL queries for v0.2.4
@@ -264,7 +264,7 @@ switch (getExtensionMode()) {
 		break;
 
 	default: // Unknown extension mode
-		logDebugMessage(__FILE__, __LINE__, sprintf("Unknown extension mode %s detected.", getExtensionMode()));
+		logDebugMessage(__FILE__, __LINE__, sprintf("Unknown extension mode %s in extension %s detected.", getExtensionMode(), getCurrentExtensionName()));
 		break;
 }