From: Aaron Schulz Date: Sun, 6 Apr 2008 16:38:20 +0000 (+0000) Subject: Use different message for log items X-Git-Tag: 1.31.0-rc.0~48579 X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=commitdiff_plain;h=0ab35a817a903f580e4a8ec73a01103e51099a75;p=lhc%2Fweb%2Fwiklou.git Use different message for log items --- diff --git a/includes/SpecialRevisiondelete.php b/includes/SpecialRevisiondelete.php index a35d73b8ff..125cec8269 100644 --- a/includes/SpecialRevisiondelete.php +++ b/includes/SpecialRevisiondelete.php @@ -1389,9 +1389,10 @@ class RevisionDeleter { * @param int $count The number of effected revisions. * @param int $nbitfield The new bitfield for the revision. * @param int $obitfield The old bitfield for the revision. - * @param String $comment The comment associated with the change. + * @param string $comment The comment associated with the change. + * @param bool $isForLog */ - function getLogMessage ( $count, $nbitfield, $obitfield, $comment ) { + function getLogMessage ( $count, $nbitfield, $obitfield, $comment, $isForLog = false ) { global $wgContLang; $s = ''; @@ -1414,7 +1415,8 @@ class RevisionDeleter { $s = $changes[2][0]; } - $ret = wfMsgExt ( 'revdelete-log-message', array( 'parsemag', 'content' ), + $msg = $isForLog ? 'logdelete-log-message' : 'revdelete-log-message'; + $ret = wfMsgExt ( $msg, array( 'parsemag', 'content' ), $s, $wgContLang->formatNum( $count ) ); if ( $comment ) @@ -1440,9 +1442,9 @@ class RevisionDeleter { $logtype = ( ($nbitfield | $obitfield) & Revision::DELETED_RESTRICTED ) ? 'suppress' : 'delete'; $log = new LogPage( $logtype ); - $reason = $this->getLogMessage ( $count, $nbitfield, $obitfield, $comment ); + $reason = $this->getLogMessage ( $count, $nbitfield, $obitfield, $comment, $param == 'logid' ); - if( $param=='logid' ) { + if( $param == 'logid' ) { $params = array( implode( ',', $items) ); $log->addEntry( 'event', $title, $reason, $params ); } else { diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php index edc0d8c5db..8939d2807c 100644 --- a/languages/messages/MessagesEn.php +++ b/languages/messages/MessagesEn.php @@ -1223,6 +1223,7 @@ Other admins on {{SITENAME}} will still be able to access the hidden content and 'revdelete-hid' => 'hid $1', 'revdelete-unhid' => 'unhid $1', 'revdelete-log-message' => '$1 for $2 {{PLURAL:$2|revision|revisions}}', +'logdelete-log-message' => '$1 for $2 {{PLURAL:$2|event|events}}', # Suppression log 'suppressionlog' => 'Suppression log',