Fixed wrong filter registrations

diff --git a/inc/extensions/ext-politician-stop.php b/inc/extensions/ext-politician-stop.php
index dcf7fe1916a093fbfe41c0161890ed078c8d7f86..275175993db62582be2ebe570f48f316b6d26803 100644 (file)
--- 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
                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
                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
                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 08e1b3f37d2cac76a236fcce03c7787f09db258e..1682dcf19639c5464e678eeb02dcbea96fc57ca4 100644 (file)
--- 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
                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
                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
        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");
 
                                // 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 4c3cae095dd75dd03a5e461401e51e0f1501191b..41e5adeca08236ea36d2126e5457919c1cb259f9 100644 (file)
--- 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
        // 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
 
                return false;
        } // END - if