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

diff --git a/includes/EditPage.php b/includes/EditPage.php
index 27e5408..391badc 100644 (file)
--- 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 636aaf2..2a50547 100644 (file)
--- 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>';
                        }