wikimedia/mediawiki-extensions-AbuseFilter
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/AbuseFilter.git synced 2024-11-27 23:40:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

(bug 33392) Fix issue where users without permission to add restricted actions could nonetheless remove them. Patch by Nikola Kovacs, with modifications for code style.

Browse source
This commit is contained in:
Andrew Garrett 2012-02-08 01:02:11 +00:00
parent d92ef3225e
commit e2479d45da
Notes: Raimond Spekking 2012-03-12 20:46:25 +00:00 
https://mediawiki.org/wiki/Special:Code/MediaWiki/110906
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
Views/AbuseFilterViewEdit.php
View file

@ -53,6 +53,7 @@ class AbuseFilterViewEdit extends AbuseFilterView {
array( $newRow->mOriginalRow, $newRow->mOriginalActions )
);
$origActions = $newRow->mOriginalActions;
unset( $newRow->mOriginalRow );
unset( $newRow->mOriginalActions );
@ -64,12 +65,18 @@ class AbuseFilterViewEdit extends AbuseFilterView {
// Check for restricted actions
global $wgAbuseFilterRestrictedActions;
$allActions = array_keys( array_merge(
array_filter( $actions ),
array_filter( $origActions )
) );
if (
array_intersect(
$wgAbuseFilterRestrictedActions,
array_keys( array_filter( $actions ) ) )
&& !$user->isAllowed( 'abusefilter-modify-restricted' ) )
{
count( array_intersect(
$wgAbuseFilterRestrictedActions,
$allActions
) )
&& !$user->isAllowed( 'abusefilter-modify-restricted' )
) {
$out->addHTML(
$this->buildFilterEditor(
wfMsgExt( 'abusefilter-edit-restricted', 'parse' ),