From: Daniel Friesen <dantman@users.mediawiki.org>
Date: Wed, 4 May 2011 01:53:05 +0000 (+0000)
Subject: Add proper $out setting to Skin::getCategories which is present in the other similar... 
X-Git-Tag: 1.31.0-rc.0~30421
X-Git-Url: https://git.cyclocoop.org/%28%28?a=commitdiff_plain;h=37ddf59571a747611da8829a470707115b64e1b2;p=lhc%2Fweb%2Fwiklou.git

Add proper $out setting to Skin::getCategories which is present in the other similar methods. Replaces r87380.
---

diff --git a/includes/Skin.php b/includes/Skin.php
index 747401b0e0..eeb71cf030 100644
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -607,9 +607,9 @@ abstract class Skin {
 	 * the ->getCategories( $out ) form with whatout OutputPage is on hand
 	 */
 	function getCategories( OutputPage $out=null ) {
-		if( !$out ) {
-			global $wgOut;
-			$out = $wgOut;
+
+		if( $out === null ){
+			$out = $this->getContext()->output;
 		}
 
 		$catlinks = $this->getCategoryLinks( $out );