avoid breaking on php5
authorRiver Tarnell <kateturner@users.mediawiki.org>
Sat, 2 Jul 2005 22:39:22 +0000 (22:39 +0000)
committerRiver Tarnell <kateturner@users.mediawiki.org>
Sat, 2 Jul 2005 22:39:22 +0000 (22:39 +0000)
includes/Skin.php

index 140e6ad..65b16d3 100644 (file)
@@ -430,34 +430,33 @@ END;
                        # get a big array of the parents tree
                        $parenttree = $wgTitle->getParentCategoryTree();
 
-                       # Render the array as a serie of links
-                       # Need to give skin cause $this is undefined at this level
-                       function walkThrough ($tree, &$skin) {
-                               $return = '';
-                               foreach($tree as $element => $parent) {
-                                       if(empty($parent)) {
-                                               # element start a new list
-                                               $return .= '<br />';
-                                       } else {
-                                               # grab the others elements
-                                               $return .= walkThrough($parent, $skin);
-                                       }
-                                       # add our current element to the list
-                                       $eltitle = Title::NewFromText($element);
-                                       if(!empty($parent)) $return .= ' &gt; ';
-                                       $return .=  $skin->makeLinkObj( $eltitle, $eltitle->getText() ) ;
-                               }
-                               return $return;
-                       }
-
                        # Skin object passed by reference cause it can not be
                        # accessed under the method subfunction walkThrough.
-                       $s .= walkThrough($parenttree, $this);
+                       $s .= Skin::drawCategoryBrowser($parenttree, $this);
                }
 
                return $s;
        }
 
+       # Render the array as a serie of links
+       function drawCategoryBrowser ($tree, &$skin) {
+               $return = '';
+               foreach ($tree as $element => $parent) {
+                       if (empty($parent)) {
+                               # element start a new list
+                               $return .= '<br />';
+                       } else {
+                               # grab the others elements
+                               $return .= Skin::drawCategoryBrowser($parent, $skin);
+                       }
+                       # add our current element to the list
+                       $eltitle = Title::NewFromText($element);
+                       if (!empty($parent)) $return .= ' &gt; ';
+                       $return .=  $skin->makeLinkObj( $eltitle, $eltitle->getText() ) ;
+               }
+               return $return;
+       }
+
        function getCategories() {
                $catlinks=$this->getCategoryLinks();
                if(!empty($catlinks)) {