From: Alexandre Emsenhuber <ialex@users.mediawiki.org>
Date: Sun, 28 Dec 2008 16:46:05 +0000 (+0000)
Subject: * Since we are in Linker, use $this->link() rather than grabbing it from $wgUser... 
X-Git-Tag: 1.31.0-rc.0~43719
X-Git-Url: https://git.cyclocoop.org/%242?a=commitdiff_plain;h=a3ce1fa9faeaade24f5d5ccd206fef5dd029e1db;p=lhc%2Fweb%2Fwiklou.git

* Since we are in Linker, use $this->link() rather than grabbing it from $wgUser->getSkin() (which is $this in the most cases)
* Add new lines in output
* Whitespaces tweaks
---

diff --git a/includes/Linker.php b/includes/Linker.php
index ec633578b8..a28352dcf6 100644
--- a/includes/Linker.php
+++ b/includes/Linker.php
@@ -1596,12 +1596,9 @@ class Linker {
 	 * @param bool $section Whether this is for a section edit
 	 * @return string HTML output
 	 */
-	public function formatTemplates( $templates, $preview = false, $section = false) {
-		global $wgUser;
+	public function formatTemplates( $templates, $preview = false, $section = false ) {
 		wfProfileIn( __METHOD__ );
 
-		$sk = $wgUser->getSkin();
-
 		$outText = '';
 		if ( count( $templates ) > 0 ) {
 			# Do a batch existence check
@@ -1620,7 +1617,7 @@ class Linker {
 			} else {
 				$outText .= wfMsgExt( 'templatesused', array( 'parse' ) );
 			}
-			$outText .= '</div><ul>';
+			$outText .= "</div><ul>\n";
 
 			usort( $templates, array( 'Title', 'compare' ) );
 			foreach ( $templates as $titleObj ) {
@@ -1633,13 +1630,13 @@ class Linker {
 					$protected = '';
 				}
 				if( $titleObj->quickUserCan( 'edit' ) ) {
-					$editLink = $sk->link( $titleObj, wfMsg( 'editlink' ), array(), array( 'action' => 'edit' ), 'known' );
+					$editLink = $this->link( $titleObj, wfMsgHtml( 'editlink' ), array(), array( 'action' => 'edit' ), 'known' );
 				} else {
-					$editLink = $sk->link( $titleObj, wfMsg( 'viewsourcelink' ), array(), array( 'action' => 'edit' ), 'known' );
+					$editLink = $this->link( $titleObj, wfMsgHtml( 'viewsourcelink' ), array(), array( 'action' => 'edit' ), 'known' );
 				}
-				$talkLink = $sk->link( $titleObj->getTalkPage(), wfMsg( 'talkpagelinktext' ) );
+				$talkLink = $this->link( $titleObj->getTalkPage(), wfMsgHtml( 'talkpagelinktext' ) );
 				$outText .= Xml::tags( 'li', array(),
-						$sk->link( $titleObj ) . ' (' . $editLink . ' ' . wfMsg( 'pipe-separator' ) . ' ' . $talkLink . ') ' . $protected );
+						$this->link( $titleObj ) . ' (' . $editLink . ' ' . wfMsgHtml( 'pipe-separator' ) . ' ' . $talkLink . ') ' . $protected ) . "\n";
 			}
 			$outText .= '</ul>';
 		}
@@ -1654,21 +1651,19 @@ class Linker {
 	 * or similar
 	 * @return string HTML output
 	 */
-	public function formatHiddenCategories( $hiddencats) {
-		global $wgUser, $wgLang;
+	public function formatHiddenCategories( $hiddencats ) {
+		global $wgLang;
 		wfProfileIn( __METHOD__ );
 
-		$sk = $wgUser->getSkin();
-
 		$outText = '';
 		if ( count( $hiddencats ) > 0 ) {
 			# Construct the HTML
 			$outText = '<div class="mw-hiddenCategoriesExplanation">';
 			$outText .= wfMsgExt( 'hiddencategories', array( 'parse' ), $wgLang->formatnum( count( $hiddencats ) ) );
-			$outText .= '</div><ul>';
+			$outText .= "</div><ul>\n";
 
 			foreach ( $hiddencats as $titleObj ) {
-				$outText .= '<li>' . $sk->link( $titleObj, null, array(), array(), 'known' ) . '</li>'; # If it's hidden, it must exist - no need to check with a LinkBatch
+				$outText .= '<li>' . $this->link( $titleObj, null, array(), array(), 'known' ) . "</li>\n"; # If it's hidden, it must exist - no need to check with a LinkBatch
 			}
 			$outText .= '</ul>';
 		}