http://www.mediawiki.org/wiki/Special:Code/MediaWiki/88992
Revision: 88992
Author: ialex
Date: 2011-05-27 19:26:00 +0000 (Fri, 27 May 2011)
Log Message:
-----------
Dropped pre-1.12 compatibility code
Modified Paths:
--------------
trunk/extensions/SpamBlacklist/SpamBlacklist.php
trunk/extensions/SpamBlacklist/SpamBlacklist_body.php
Modified: trunk/extensions/SpamBlacklist/SpamBlacklist.php
===================================================================
--- trunk/extensions/SpamBlacklist/SpamBlacklist.php 2011-05-27 19:24:00 UTC
(rev 88991)
+++ trunk/extensions/SpamBlacklist/SpamBlacklist.php 2011-05-27 19:26:00 UTC
(rev 88992)
@@ -18,24 +18,13 @@
$dir = dirname(__FILE__) . '/';
$wgExtensionMessagesFiles['SpamBlackList'] = $dir . 'SpamBlacklist.i18n.php';
-global $wgFilterCallback, $wgPreSpamFilterCallback;
global $wgSpamBlacklistFiles;
global $wgSpamBlacklistSettings;
$wgSpamBlacklistFiles = false;
$wgSpamBlacklistSettings = array();
-$wgPreSpamFilterCallback = false;
-
-if ( defined( 'MW_SUPPORTS_EDITFILTERMERGED' ) ) {
- $wgHooks['EditFilterMerged'][] = 'wfSpamBlacklistFilterMerged';
-} else {
- if ( $wgFilterCallback ) {
- $wgPreSpamFilterCallback = $wgFilterCallback;
- }
- $wgFilterCallback = 'wfSpamBlacklistFilter';
-}
-
+$wgHooks['EditFilterMerged'][] = 'wfSpamBlacklistFilterMerged';
$wgHooks['EditFilter'][] = 'wfSpamBlacklistValidate';
$wgHooks['ArticleSaveComplete'][] = 'wfSpamBlacklistArticleSave';
$wgHooks['APIEditBeforeSave'][] = 'wfSpamBlacklistFilterAPIEditBeforeSave';
@@ -45,7 +34,7 @@
* All actual functionality is implemented in that object
*/
function wfSpamBlacklistObject() {
- global $wgSpamBlacklistFiles, $wgSpamBlacklistSettings,
$wgPreSpamFilterCallback;
+ global $wgSpamBlacklistFiles, $wgSpamBlacklistSettings;
static $spamObj;
if ( !$spamObj ) {
require_once( "SpamBlacklist_body.php" );
@@ -53,26 +42,13 @@
if( $wgSpamBlacklistFiles ) {
$spamObj->files = $wgSpamBlacklistFiles;
}
- $spamObj->previousFilter = $wgPreSpamFilterCallback;
}
return $spamObj;
}
/**
- * Hook function for $wgFilterCallback
+ * Hook function for EditFilterMerged
*/
-function wfSpamBlacklistFilter( &$title, $text, $section, &$hookErr,
$editSummary ) {
- $spamObj = wfSpamBlacklistObject();
- $ret = $spamObj->filter( $title, $text, $section, $editSummary );
- if ( $ret !== false ){
- EditPage::spamPage( $ret );
- }
- return ( $ret !== false );
-}
-
-/**
- * Hook function for EditFilterMerged, replaces wfSpamBlacklistFilter
- */
function wfSpamBlacklistFilterMerged( $editPage, $text, &$hookErr,
$editSummary ) {
global $wgTitle;
if( is_null( $wgTitle ) ) {
Modified: trunk/extensions/SpamBlacklist/SpamBlacklist_body.php
===================================================================
--- trunk/extensions/SpamBlacklist/SpamBlacklist_body.php 2011-05-27
19:24:00 UTC (rev 88991)
+++ trunk/extensions/SpamBlacklist/SpamBlacklist_body.php 2011-05-27
19:26:00 UTC (rev 88992)
@@ -6,7 +6,6 @@
class SpamBlacklist {
var $regexes = false;
- var $previousFilter = false;
var $files = array(
"http://meta.wikimedia.org/w/index.php?title=Spam_blacklist&action=raw&sb_ver=1";
);
var $warningTime = 600;
var $expiryTime = 900;
@@ -189,15 +188,6 @@
$fname = 'wfSpamBlacklistFilter';
wfProfileIn( $fname );
- # Call the rest of the hook chain first
- if ( $this->previousFilter ) {
- $f = $this->previousFilter;
- if ( $f( $title, $text, $section ) ) {
- wfProfileOut( $fname );
- return true;
- }
- }
-
$this->title = $title;
$this->text = $text;
$this->section = $section;
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
