From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Thu, 31 Jan 2013 20:23:34 +0000 (+0000)
Subject: Merge "Followup I888c616e: Keep IRC line format unchanged."
X-Git-Tag: 1.31.0-rc.0~20844
X-Git-Url: http://git.cyclocoop.org/%22.%24image2.%22?a=commitdiff_plain;h=04b47c018040aa8cf520cbbaab4071dac54a6b27;p=lhc%2Fweb%2Fwiklou.git

Merge "Followup I888c616e: Keep IRC line format unchanged."
---

04b47c018040aa8cf520cbbaab4071dac54a6b27
diff --cc includes/WikiPage.php
index 49a944bb74,d9cfc9226c..7686ed807f
--- a/includes/WikiPage.php
+++ b/includes/WikiPage.php
@@@ -2307,10 -2312,12 +2312,12 @@@ class WikiPage extends Page implements 
  				$protectDescription .= wfMessage( 'protect-summary-desc' )
  					->params( $actionText, $restrictionsText, $expiryText )
  					->inContentLanguage()->text();
+ 				$protectDescriptionLog .= $expiryText . ') ';
  			}
  		}
+ 		$protectDescriptionLog = trim( $protectDescriptionLog );
  
 -		if ( $id ) { # Protection of existing page
 +		if ( $id ) { // Protection of existing page
  			if ( !wfRunHooks( 'ArticleProtect', array( &$this, &$user, $limit, $reason ) ) ) {
  				return Status::newGood();
  			}
@@@ -2413,10 -2420,10 +2420,10 @@@
  		if ( $logAction == 'unprotect' ) {
  			$logParams = array();
  		} else {
- 			$logParams = array( $protectDescription, $cascade ? 'cascade' : '' );
+ 			$logParams = array( $protectDescriptionLog, $cascade ? 'cascade' : '' );
  		}
  
 -		# Update the protection log
 +		// Update the protection log
  		$log = new LogPage( 'protect' );
  		$log->addEntry( $logAction, $this->mTitle, trim( $reason ), $logParams, $user );