Use Skin->getCategories() instead of Skin->getCategoryLinks() and manually wrapping...

* 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 ad0dc6f..3e5bc0f 100644 (file)
--- 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 d77a930..21d3578 100644 (file)
--- 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'>";