From: Aryeh Gregor <simetrical@users.mediawiki.org>
Date: Tue, 21 Nov 2006 03:22:18 +0000 (+0000)
Subject: Code style tweaks per brion's suggestions on Wikitech-l
X-Git-Tag: 1.31.0-rc.0~55139
X-Git-Url: https://git.cyclocoop.org/%7B%24admin_url%7Dmembres/fiche.php?a=commitdiff_plain;h=db76f088191e7e6d4c968254b81548b6a32c337a;p=lhc%2Fweb%2Fwiklou.git

Code style tweaks per brion's suggestions on Wikitech-l
---

diff --git a/includes/EditPage.php b/includes/EditPage.php
index 27e5408f52..391badcbb3 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -1040,7 +1040,7 @@ class EditPage {
 			$wgOut->setOnloadHandler( 'document.editform.wpTextbox1.focus()' );
 		}
 		$templates = ($this->preview || $this->section) ? $this->mPreviewTemplates : $this->mArticle->getUsedTemplates();
-		$templates = $sk->formatTemplates( $templates, $this->preview, $this->section != '');
+		$formattedtemplates = $sk->formatTemplates( $templates, $this->preview, $this->section != '');
 
 		global $wgUseMetadataEdit ;
 		if ( $wgUseMetadataEdit ) {
@@ -1183,7 +1183,7 @@ END
 
 		$wgOut->addHTML( "
 <div class='templatesUsed'>
-{$templates}
+{$formattedtemplates}
 </div>
 " );
 
diff --git a/includes/Linker.php b/includes/Linker.php
index 636aaf2970..2a50547d61 100644
--- a/includes/Linker.php
+++ b/includes/Linker.php
@@ -1152,9 +1152,14 @@ class Linker {
 			$batch->execute();
 
 			# Construct the HTML
-			$outText = '<div class="mw-templatesUsedExplanation">' .
-				wfMsgExt( 'templatesused' . ( $preview ? 'preview' : ( $section ? 'section' : '' ) ), array( 'parse' ) ) .
-				'</div><ul>';
+			$outText = '<div class="mw-templatesUsedExplanation">';
+			if ($preview)
+				$outText .= wfMsgExt( 'templatesusedpreview', array( 'parse' ) );
+			elseif ($section)
+				$outText .= wfMsgExt( 'templatesusedsection', array( 'parse' ) );
+			else
+				$outText .= wfMsgExt( 'templatesused', array( 'parse' ) );
+			$outText .= '</div><ul>';
 			foreach ( $templates as $titleObj ) {
 				$outText .= '<li>' . $sk->makeLinkObj( $titleObj ) . '</li>';
 			}