jenkins-bot has submitted this change and it was merged.
Change subject: Make AbuseFilter work without AntiSpoof
......................................................................
Make AbuseFilter work without AntiSpoof
This dependency isn't really needed in many cases
while it can cause troubles if not fulfilled.
Change-Id: I9990e99c4d3d49b5bc400bbc4a0ec02142d6f055
---
M AbuseFilter.parser.php
1 file changed, 12 insertions(+), 4 deletions(-)
Approvals:
CSteipp: Looks good to me, approved
jenkins-bot: Verified
diff --git a/AbuseFilter.parser.php b/AbuseFilter.parser.php
index 601c8bd..13c5428 100644
--- a/AbuseFilter.parser.php
+++ b/AbuseFilter.parser.php
@@ -1926,13 +1926,21 @@
* @return mixed
*/
protected function ccnorm( $s ) {
- static $equivset = null;
static $replacementArray = null;
- if ( is_null( $equivset ) || is_null( $replacementArray ) ) {
+ if ( is_null( $replacementArray ) ) {
global $IP;
- require_once( "$IP/extensions/AntiSpoof/equivset.php" );
- $replacementArray = new ReplacementArray( $equivset );
+ if ( is_readable(
"$IP/extensions/AntiSpoof/equivset.php" ) ) {
+ require "$IP/extensions/AntiSpoof/equivset.php";
+ $replacementArray = new ReplacementArray(
$equivset );
+ } else {
+ // AntiSpoof isn't available, so just create a
dummy
+ wfDebugLog(
+ 'AbuseFilter',
+ "Can't compute normalized string
(ccnorm) as the AntiSpoof Extension isn't isntalled."
+ );
+ $replacementArray = new ReplacementArray(
array() );
+ }
}
return $replacementArray->replace( $s );
--
To view, visit https://gerrit.wikimedia.org/r/71572
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9990e99c4d3d49b5bc400bbc4a0ec02142d6f055
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/AbuseFilter
Gerrit-Branch: master
Gerrit-Owner: Hoo man <[email protected]>
Gerrit-Reviewer: Anomie <[email protected]>
Gerrit-Reviewer: CSteipp <[email protected]>
Gerrit-Reviewer: Hoo man <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
