summaryrefslogtreecommitdiff
path: root/extensions/SpamBlacklist/BaseBlacklist.php
diff options
context:
space:
mode:
authorPierre Schmitz <pierre@archlinux.de>2015-06-04 07:31:04 +0200
committerPierre Schmitz <pierre@archlinux.de>2015-06-04 07:58:39 +0200
commitf6d65e533c62f6deb21342d4901ece24497b433e (patch)
treef28adf0362d14bcd448f7b65a7aaf38650f923aa /extensions/SpamBlacklist/BaseBlacklist.php
parentc27b2e832fe25651ef2410fae85b41072aae7519 (diff)
Update to MediaWiki 1.25.1
Diffstat (limited to 'extensions/SpamBlacklist/BaseBlacklist.php')
-rw-r--r--extensions/SpamBlacklist/BaseBlacklist.php8
1 files changed, 2 insertions, 6 deletions
diff --git a/extensions/SpamBlacklist/BaseBlacklist.php b/extensions/SpamBlacklist/BaseBlacklist.php
index 280a614a..b1958c35 100644
--- a/extensions/SpamBlacklist/BaseBlacklist.php
+++ b/extensions/SpamBlacklist/BaseBlacklist.php
@@ -87,11 +87,11 @@ abstract class BaseBlacklist {
*
* @param $type string Code for the blacklist
* @return BaseBlacklist
- * @throws MWException
+ * @throws Exception
*/
public static function getInstance( $type ) {
if ( !isset( self::$blacklistTypes[$type] ) ) {
- throw new MWException( "Invalid blacklist type '$type' passed to " . __METHOD__ );
+ throw new Exception( "Invalid blacklist type '$type' passed to " . __METHOD__ );
}
if ( !isset( self::$instances[$type] ) ) {
@@ -223,15 +223,12 @@ abstract class BaseBlacklist {
function getSharedBlacklists() {
global $wgMemc, $wgDBname;
$listType = $this->getBlacklistType();
- $fname = 'SpamBlacklist::getRegex';
- wfProfileIn( $fname );
wfDebugLog( 'SpamBlacklist', "Loading $listType regex..." );
if ( count( $this->files ) == 0 ){
# No lists
wfDebugLog( 'SpamBlacklist', "no files specified\n" );
- wfProfileOut( $fname );
return array();
}
@@ -240,7 +237,6 @@ abstract class BaseBlacklist {
$cachedRegexes = $wgMemc->get( "$wgDBname:{$listType}_blacklist_regexes" );
if( is_array( $cachedRegexes ) ) {
wfDebugLog( 'SpamBlacklist', "Got shared spam regexes from cache\n" );
- wfProfileOut( $fname );
return $cachedRegexes;
}