From a6338d45de26f6d08ff8fb3827fdc34157214b3f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Wed, 25 Nov 2009 16:37:44 +0000 Subject: [PATCH] Fixed wrong filter registrations --- inc/extensions/ext-politician-stop.php | 4 ++-- inc/extensions/ext-uberwach.php | 4 ++-- inc/filter-functions.php | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/inc/extensions/ext-politician-stop.php b/inc/extensions/ext-politician-stop.php index dcf7fe1916..275175993d 100644 --- a/inc/extensions/ext-politician-stop.php +++ b/inc/extensions/ext-politician-stop.php @@ -54,12 +54,12 @@ switch (getExtensionMode()) { addExtensionAdminMenuSql('config','config_politician_stop','Politiker-Stopp-Aktion','Einstellungen zur Satire-Aktion "Politiker-Stopp - Jetzt wird zurück zensiert."', 7); // Register filter - registerFilter('page_footer', 'DISPLAY_UBERWACH_SNIPPET', false, true, getExtensionDryRun()); + registerFilter('page_footer', 'DISPLAY_POLITICAN_STOP_SNIPPET', false, true, getExtensionDryRun()); break; case 'remove': // Do stuff when removing extension // Unregister filter - unregisterFilter('page_footer', 'DISPLAY_UBERWACH_SNIPPET', false, true, getExtensionDryRun()); + unregisterFilter('page_footer', 'DISPLAY_POLITICAN_STOP_SNIPPET', false, true, getExtensionDryRun()); break; case 'activate': // Do stuff when admin activates this extension diff --git a/inc/extensions/ext-uberwach.php b/inc/extensions/ext-uberwach.php index 08e1b3f37d..1682dcf196 100644 --- a/inc/extensions/ext-uberwach.php +++ b/inc/extensions/ext-uberwach.php @@ -57,7 +57,7 @@ switch (getExtensionMode()) { addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE `what`='config_uberwach' LIMIT 1"); // Unregister filter - unregisterFilter('page_footer', 'DISPLAY_POLITICIAN_STOP_SNIPPET', false, true, getExtensionDryRun()); + unregisterFilter('page_footer', 'DISPLAY_UBERWACH_SNIPPET', false, true, getExtensionDryRun()); break; case 'activate': // Do stuff when admin activates this extension @@ -71,7 +71,7 @@ switch (getExtensionMode()) { case 'update': // Update an extension switch (getCurrentExtensionVersion()) { case '0.0.1': // SQL queries for v0.0.1 - registerFilter('page_footer', 'DISPLAY_POLITICIAN_STOP_SNIPPET', false, true, getExtensionDryRun()); + registerFilter('page_footer', 'DISPLAY_UBERWACH_SNIPPET', false, true, getExtensionDryRun()); // Update notes (these will be set as task text!) setExtensionUpdateNotes("Filter zum Anzeigen des Snippets hinzugefügt"); diff --git a/inc/filter-functions.php b/inc/filter-functions.php index 4c3cae095d..41e5adeca0 100644 --- a/inc/filter-functions.php +++ b/inc/filter-functions.php @@ -232,7 +232,7 @@ function unregisterFilter ($filterName, $filterFunction, $force = false, $dry_ru // Is that filter there? if ((!isset($GLOBALS['cache_array']['filter']['chains'][$filterName][$filterFunction])) && ($force === false)) { // Not found, so abort here - addFatalMessage(__FUNCTION__, __LINE__, getMessage('FILTER_FAILED_NOT_REMOVED'), array($filterFunction, $filterName)); + addFatalMessage(__FUNCTION__, __LINE__, sprintf(getMessage('FILTER_FAILED_NOT_REMOVED'), $filterFunction, $filterName)); return false; } // END - if -- 2.39.2