From: Niklas Laxström <nikerabbit@users.mediawiki.org>
Date: Sat, 27 Aug 2005 18:50:51 +0000 (+0000)
Subject: Don't mess recent changes
X-Git-Tag: 1.6.0~1776
X-Git-Url: https://git.cyclocoop.org/%242?a=commitdiff_plain;h=9d64c3e2e77fdf490a1d2bcc8d85407562a98f0d;p=lhc%2Fweb%2Fwiklou.git

Don't mess recent changes
---

diff --git a/includes/LogPage.php b/includes/LogPage.php
index f1888c9807..02270e33ec 100644
--- a/includes/LogPage.php
+++ b/includes/LogPage.php
@@ -155,7 +155,7 @@ class LogPage {
 	/**
 	 * @static
 	 */
-	function actionText( $type, $action, $title = NULL, $skin = NULL, $params = array(), $filterWikilinks=false ) {
+	function actionText( $type, $action, $title = NULL, $skin = NULL, $params = array(), $filterWikilinks=false, $translate=false ) {
 		global $wgLang;
 		static $actions = array(
 			'block/block'       => 'blocklogentry',
@@ -194,7 +194,7 @@ class LogPage {
 					$rv = wfMsg( $actions[$key], $titleLink );
 				} else {
 					array_unshift( $params, $titleLink );
-					if ( $key == 'block/block' ) {
+					if ( $translate && $key == 'block/block' ) {
 						$params[1] = $wgLang->translateBlockExpiry($params[1]);
 					}
 					$rv = wfMsgReal( $actions[$key], $params, true, false );
diff --git a/includes/SpecialLog.php b/includes/SpecialLog.php
index dd09871d20..a981310ca9 100644
--- a/includes/SpecialLog.php
+++ b/includes/SpecialLog.php
@@ -322,7 +322,7 @@ class LogViewer {
 			}
 		}
 
-		$action = LogPage::actionText( $s->log_type, $s->log_action, $title, $this->skin, $paramArray, true );
+		$action = LogPage::actionText( $s->log_type, $s->log_action, $title, $this->skin, $paramArray, true, true );
 		$out = "<li>$time $userLink $action $comment $revert</li>\n";
 		return $out;
 	}