From: Krinkle <krinkle@users.mediawiki.org>
Date: Sat, 17 Sep 2011 18:03:18 +0000 (+0000)
Subject: Use Skin->getCategories() instead of Skin->getCategoryLinks() and manually wrapping... 
X-Git-Tag: 1.31.0-rc.0~27588
X-Git-Url: http://git.cyclocoop.org/%28?a=commitdiff_plain;h=e3293aa73ec4c2c990cbd709706c1f122470cc8e;p=lhc%2Fweb%2Fwiklou.git

Use Skin->getCategories() instead of Skin->getCategoryLinks() and manually wrapping the #catlinks element around it. This to use the centralized output control, no need to duplicate the IDs and class names here.
* Also removing the conditional addition of <br />, which is no longer needed since <div> is a block level element which downs;t need a line break to start on a new line (this <br />) hasn't been needed since it's an unordered list (r92054)
* Follows-up r92054 and it's CR
---

diff --git a/skins/CologneBlue.php b/skins/CologneBlue.php
index ad0dc6f6ee..3e5bc0f310 100644
--- a/skins/CologneBlue.php
+++ b/skins/CologneBlue.php
@@ -77,10 +77,9 @@ class CologneBlueTemplate extends LegacyTemplate {
 
 		$s .= '<font size="-1"><span id="langlinks">';
 		$s .= str_replace( '<br />', '', $this->otherLanguages() );
-		$cat = '<div id="catlinks" class="catlinks">' . $this->getSkin()->getCategoryLinks() . '</div>';
-		if( $cat ) {
-			$s .= "<br />$cat\n";
-		}
+
+		$s .= $this->getSkin()->getCategories();
+
 		$s .= '<br />' . $this->pageTitleLinks();
 		$s .= '</span></font>';
 
diff --git a/skins/Nostalgia.php b/skins/Nostalgia.php
index d77a930614..21d3578d81 100644
--- a/skins/Nostalgia.php
+++ b/skins/Nostalgia.php
@@ -54,10 +54,7 @@ class NostalgiaTemplate extends LegacyTemplate {
 			$s .= '<br />' . $ol;
 		}
 
-		$cat = '<div id="catlinks" class="catlinks">' . $this->getSkin()->getCategoryLinks() . '</div>';
-		if( $cat ) {
-			$s .= '<br />' . $cat;
-		}
+		$s .= $this->getSkin()->getCategories();
 
 		$s .= "<br clear='all' /></div><hr />\n</div>\n";
 		$s .= "\n<div id='article'>";