Index: extensions/MirrorTools/APIMirrorTools.php
===================================================================
--- extensions/MirrorTools/APIMirrorTools.php   (revision 114024)
+++ extensions/MirrorTools/APIMirrorTools.php   (working copy)
@@ -264,9 +264,6 @@
            case EditPage::AS_SPAM_ERROR:
                $this->dieUsageMsg( array( 'spamdetected', $result['spam'] ) );

-           case EditPage::AS_FILTERING:
-               $this->dieUsageMsg( array( 'filtered' ) );
-
            case EditPage::AS_BLOCKED_PAGE_FOR_USER:
                $this->dieUsageMsg( array( 'blockedtext' ) );

@@ -372,4 +369,4 @@
    public function getVersion() {
        return __CLASS__ . ': $Id: ApiMirrorEditPage.php 68353 2010-06-21 13:13:32Z hartman $';
    }
-}
\ No newline at end of file
+}
Index: extensions/MirrorTools/MirrorTools.classes.php
===================================================================
--- extensions/MirrorTools/MirrorTools.classes.php  (revision 114024)
+++ extensions/MirrorTools/MirrorTools.classes.php  (working copy)
@@ -6,7 +6,7 @@
     * @return one of the constants describing the result
     */
    function mirrorinternalAttemptSave( &$result, $bot = false, $mirrorUser ) {
-       global $wgFilterCallback, $wgUser, $wgOut, $wgParser;
+       global $wgUser, $wgOut, $wgParser;
        global $wgMaxArticleSize;
                 $user = User::newFromName ( $mirrorUser, true );
        wfProfileIn( __METHOD__  );
@@ -43,12 +43,6 @@
            wfProfileOut( __METHOD__ );
            return self::AS_SPAM_ERROR;
        }
-       if ( $wgFilterCallback && $wgFilterCallback( $this->mTitle, $this->textbox1, $this->section, $this->hookError, $this->summary ) ) {
-           # Error messages or other handling should be performed by the filter function
-           wfProfileOut( __METHOD__ . '-checks' );
-           wfProfileOut( __METHOD__ );
-           return self::AS_FILTERING;
-       }
        if ( !wfRunHooks( 'EditFilter', array( $this, $this->textbox1, $this->section, &$this->hookError, $this->summary ) ) ) {
            # Error messages etc. could be handled within the hook...
            wfProfileOut( __METHOD__ . '-checks' );
@@ -314,4 +308,4 @@
        wfProfileOut( __METHOD__ );
        return self::AS_END;
    }
-}
\ No newline at end of file
+}
Index: extensions/Configure/scripts/findSettings.php
===================================================================
--- extensions/Configure/scripts/findSettings.php   (revision 114024)
+++ extensions/Configure/scripts/findSettings.php   (working copy)
@@ -167,7 +167,6 @@
                    'wgExtensionFunctions',        // Extensions only
                    'wgExtensionMessagesFiles',    // Extensions only
                    'wgFeedClasses',               // Needs PHP code
-                   'wgFilterCallback',            // Needs PHP code
                    'wgHooks',                     // Extensions only
                    'wgInputEncoding',             // Deprecated
                    'wgJobClasses',                // Extensions only
Index: extensions/SemanticForms/includes/SF_Utils.php
===================================================================
--- extensions/SemanticForms/includes/SF_Utils.php  (revision 114024)
+++ extensions/SemanticForms/includes/SF_Utils.php  (working copy)
@@ -689,7 +689,6 @@
            case EditPage::AS_TEXTBOX_EMPTY:
            case EditPage::AS_MAX_ARTICLE_SIZE_EXCEEDED:
            case EditPage::AS_END:
-           case EditPage::AS_FILTERING:
            default:
                return array( 'internalerror_text', array ( $error ) );
        }
Index: extensions/WikiObjectModel/includes/apis/WOM_SetObjectModel.php
===================================================================
--- extensions/WikiObjectModel/includes/apis/WOM_SetObjectModel.php (revision 114024)
+++ extensions/WikiObjectModel/includes/apis/WOM_SetObjectModel.php (working copy)
@@ -212,9 +212,6 @@
                case EditPage::AS_SPAM_ERROR:
                    $this->dieUsageMsg( array( 'spamdetected', $result['spam'] ) );

-               case EditPage::AS_FILTERING:
-                   $this->dieUsageMsg( array( 'filtered' ) );
-
                case EditPage::AS_BLOCKED_PAGE_FOR_USER:
                    $this->dieUsageMsg( array( 'blockedtext' ) );

@@ -316,7 +313,6 @@
            array( 'noimageredirect-anon' ),
            array( 'noimageredirect-logged' ),
            array( 'spamdetected', 'spam' ),
-           array( 'filtered' ),
            array( 'blockedtext' ),
            array( 'contenttoobig', $wgMaxArticleSize ),
            array( 'noedit-anon' ),
Index: extensions/Form/Form.body.php
===================================================================
--- extensions/Form/Form.body.php   (revision 114024)
+++ extensions/Form/Form.body.php   (working copy)
@@ -255,7 +255,7 @@

    # Had to crib some checks from EditPage.php, since they're not done in Article.php
    function checkSave( $nt, $text ) {
-       global $wgSpamRegex, $wgFilterCallback, $wgUser, $wgMaxArticleSize, $wgOut;
+       global $wgSpamRegex, $wgUser, $wgMaxArticleSize, $wgOut;

        $matches = array();
        $errortext = '';
@@ -266,9 +266,6 @@
        if ( $wgSpamRegex && preg_match( $wgSpamRegex, $text, $matches ) ) {
            $wgOut->showErrorPage( 'formsaveerror', 'formsaveerrortext' );
            return false;
-       } elseif ( $wgFilterCallback && $wgFilterCallback( $nt, $text, 0 ) ) {
-           $wgOut->showErrorPage( 'formsaveerror', 'formsaveerrortext' );
-           return false;
        } elseif ( !wfRunHooks( 'EditFilter', array( $editPage, $text, 0, &$errortext ) ) ) {
            # Hooks usually print their own error
            return false;
Index: extensions/Postcomment/Postcomment.php
===================================================================
--- extensions/Postcomment/Postcomment.php  (revision 114024)
+++ extensions/Postcomment/Postcomment.php  (working copy)
@@ -37,7 +37,7 @@
    function execute( $par ) {
        global $wgUser, $wgOut, $wgLang, $wgMemc, $wgDBname;
        global $wgRequest, $wgSitename, $wgLanguageCode;
-       global $wgFilterCallback, $wgWhitelistEdit;
+       global $wgWhitelistEdit;

        //echo "topic: " . $wgRequest->getVal("topic_name") . "<br />";
        //echo "title: " . $wgRequest->getVal("title") . "<br />";
@@ -107,7 +107,8 @@
        $text .= "\n\n$formattedComment\n\n";

        $tmp = "";
-       if ( $wgFilterCallback && $wgFilterCallback( $t, $text, $tmp) ) {
+       $errorText = '';
+       if ( !wfRunHooks( 'EditFilter', array( new FakeEditPage( $t ), $text, $tmp, &$errorText ) ) {
            # Error messages or other handling should be performed by the filter function
            return;