| Index: trunk/extensions/ArticleFeedbackv5/ArticleFeedbackv5.php |
| — | — | @@ -312,12 +312,12 @@ |
| 313 | 313 | $wgLogTypes[] = 'articlefeedbackv5'; |
| 314 | 314 | $wgLogNames['articlefeedbackv5'] = 'articlefeedbackv5-log-name'; |
| 315 | 315 | $wgLogHeaders['articlefeedbackv5'] = 'articlefeedbackv5-log-header'; |
| 316 | | -$wgLogActions['articlefeedbackv5/oversight'] = 'articlefeedbackv5-log-oversight'; |
| 317 | | -$wgLogActions['articlefeedbackv5/unoversight'] = 'articlefeedbackv5-log-unoversight'; |
| | 316 | +$wgLogActions['suppress/oversight'] = 'articlefeedbackv5-log-oversight'; |
| | 317 | +$wgLogActions['suppress/unoversight'] = 'articlefeedbackv5-log-unoversight'; |
| 318 | 318 | $wgLogActions['articlefeedbackv5/hidden'] = 'articlefeedbackv5-log-hidden'; |
| 319 | 319 | $wgLogActions['articlefeedbackv5/unhidden'] = 'articlefeedbackv5-log-unhidden'; |
| 320 | | -$wgLogActions['articlefeedbackv5/decline'] = 'articlefeedbackv5-log-decline'; |
| 321 | | -$wgLogActions['articlefeedbackv5/request'] = 'articlefeedbackv5-log-request'; |
| 322 | | -$wgLogActions['articlefeedbackv5/unrequest'] = 'articlefeedbackv5-log-unrequest'; |
| | 320 | +$wgLogActions['suppress/decline'] = 'articlefeedbackv5-log-decline'; |
| | 321 | +$wgLogActions['suppress/request'] = 'articlefeedbackv5-log-request'; |
| | 322 | +$wgLogActions['suppress/unrequest'] = 'articlefeedbackv5-log-unrequest'; |
| 323 | 323 | $wgLogActions['articlefeedbackv5/flag'] = 'articlefeedbackv5-log-flag'; |
| 324 | 324 | $wgLogActions['articlefeedbackv5/unflag'] = 'articlefeedbackv5-log-unflag'; |
| Index: trunk/extensions/ArticleFeedbackv5/api/ApiArticleFeedbackv5Utils.php |
| — | — | @@ -215,11 +215,21 @@ |
| 216 | 216 | $valid = array( 'oversight', 'unoversight', 'hidden', 'unhidden', |
| 217 | 217 | 'decline', 'request', 'unrequest', 'flag', 'unflag' ); |
| 218 | 218 | |
| | 219 | + // suppress |
| | 220 | + $suppress = array( 'oversight', 'unoversight', 'decline', 'request', 'unrequest'); |
| | 221 | + |
| 219 | 222 | // if we do not have a valid action, return immediately |
| 220 | 223 | if ( !in_array( $type, $valid ) ) { |
| 221 | 224 | return; |
| 222 | 225 | } |
| 223 | 226 | |
| | 227 | + // log type might be afv5 or suppress |
| | 228 | + $logtype = 'articlefeedbackv5'; |
| | 229 | + |
| | 230 | + if ( in_array( $type, $suppress ) ) { |
| | 231 | + $logtype = 'suppress'; |
| | 232 | + } |
| | 233 | + |
| 224 | 234 | // we only have the page id, we need the string page name for the permalink |
| 225 | 235 | $title_object = Title::newFromID( $pageId ); |
| 226 | 236 | |
| — | — | @@ -251,7 +261,7 @@ |
| 252 | 262 | $doer = null; |
| 253 | 263 | } |
| 254 | 264 | |
| 255 | | - $log = new LogPage( 'articlefeedbackv5' ); |
| | 265 | + $log = new LogPage( $logtype, false ); |
| 256 | 266 | // comments become the notes section from the feedback |
| 257 | 267 | $log->addEntry( $type, $permalink, $notes, array(), $doer ); |
| 258 | 268 | |