https://www.mediawiki.org/wiki/Special:Code/MediaWiki/114194
Revision: 114194
Author: emsmith
Date: 2012-03-19 21:42:01 +0000 (Mon, 19 Mar 2012)
Log Message:
-----------
bug 35254 - oversight items (request and unrequest oversight, decline
oversight, oversight and unoversight) now go directly to the suppressionlog
instead of into the afv5 activity log
Modified Paths:
--------------
trunk/extensions/ArticleFeedbackv5/ArticleFeedbackv5.php
trunk/extensions/ArticleFeedbackv5/api/ApiArticleFeedbackv5Utils.php
Modified: trunk/extensions/ArticleFeedbackv5/ArticleFeedbackv5.php
===================================================================
--- trunk/extensions/ArticleFeedbackv5/ArticleFeedbackv5.php 2012-03-19
21:41:49 UTC (rev 114193)
+++ trunk/extensions/ArticleFeedbackv5/ArticleFeedbackv5.php 2012-03-19
21:42:01 UTC (rev 114194)
@@ -312,12 +312,12 @@
$wgLogTypes[] = 'articlefeedbackv5';
$wgLogNames['articlefeedbackv5'] = 'articlefeedbackv5-log-name';
$wgLogHeaders['articlefeedbackv5'] = 'articlefeedbackv5-log-header';
-$wgLogActions['articlefeedbackv5/oversight'] =
'articlefeedbackv5-log-oversight';
-$wgLogActions['articlefeedbackv5/unoversight'] =
'articlefeedbackv5-log-unoversight';
+$wgLogActions['suppress/oversight'] = 'articlefeedbackv5-log-oversight';
+$wgLogActions['suppress/unoversight'] = 'articlefeedbackv5-log-unoversight';
$wgLogActions['articlefeedbackv5/hidden'] = 'articlefeedbackv5-log-hidden';
$wgLogActions['articlefeedbackv5/unhidden'] =
'articlefeedbackv5-log-unhidden';
-$wgLogActions['articlefeedbackv5/decline'] = 'articlefeedbackv5-log-decline';
-$wgLogActions['articlefeedbackv5/request'] = 'articlefeedbackv5-log-request';
-$wgLogActions['articlefeedbackv5/unrequest'] =
'articlefeedbackv5-log-unrequest';
+$wgLogActions['suppress/decline'] = 'articlefeedbackv5-log-decline';
+$wgLogActions['suppress/request'] = 'articlefeedbackv5-log-request';
+$wgLogActions['suppress/unrequest'] = 'articlefeedbackv5-log-unrequest';
$wgLogActions['articlefeedbackv5/flag'] = 'articlefeedbackv5-log-flag';
$wgLogActions['articlefeedbackv5/unflag'] = 'articlefeedbackv5-log-unflag';
Modified: trunk/extensions/ArticleFeedbackv5/api/ApiArticleFeedbackv5Utils.php
===================================================================
--- trunk/extensions/ArticleFeedbackv5/api/ApiArticleFeedbackv5Utils.php
2012-03-19 21:41:49 UTC (rev 114193)
+++ trunk/extensions/ArticleFeedbackv5/api/ApiArticleFeedbackv5Utils.php
2012-03-19 21:42:01 UTC (rev 114194)
@@ -215,11 +215,21 @@
$valid = array( 'oversight', 'unoversight', 'hidden',
'unhidden',
'decline', 'request', 'unrequest', 'flag',
'unflag' );
+ // suppress
+ $suppress = array( 'oversight', 'unoversight', 'decline',
'request', 'unrequest');
+
// if we do not have a valid action, return immediately
if ( !in_array( $type, $valid ) ) {
return;
}
+ // log type might be afv5 or suppress
+ $logtype = 'articlefeedbackv5';
+
+ if ( in_array( $type, $suppress ) ) {
+ $logtype = 'suppress';
+ }
+
// we only have the page id, we need the string page name for
the permalink
$title_object = Title::newFromID( $pageId );
@@ -251,7 +261,7 @@
$doer = null;
}
- $log = new LogPage( 'articlefeedbackv5' );
+ $log = new LogPage( $logtype, false );
// comments become the notes section from the feedback
$log->addEntry( $type, $permalink, $notes, array(), $doer );
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
