[MediaWiki-CVS] SVN: [113260] trunk/extensions/SideBarMenu/includes/MenuParser.php

[netbrain]

https://www.mediawiki.org/wiki/Special:Code/MediaWiki/113260

Revision: 113260
Author:   netbrain
Date:     2012-03-07 18:02:54 +0000 (Wed, 07 Mar 2012)
Log Message:
-----------
Merge branch 'master' of github.com:netbrain/mediawiki-SideBarMenu

Conflicts:
        includes/MenuParser.php

Modified Paths:
--------------
    trunk/extensions/SideBarMenu/includes/MenuParser.php

Modified: trunk/extensions/SideBarMenu/includes/MenuParser.php
===================================================================
--- trunk/extensions/SideBarMenu/includes/MenuParser.php        2012-03-07 
17:50:26 UTC (rev 113259)
+++ trunk/extensions/SideBarMenu/includes/MenuParser.php        2012-03-07 
18:02:54 UTC (rev 113260)
@@ -45,6 +45,7 @@
             $this->addChildrenToMenuItemFromArrayData($root,$arrayData);
             return $root;
         }
+        return null;
     }
 
 
@@ -64,7 +65,6 @@
     public function parseDataIntoHierarchicalArray($data)
     {
         $rootArray = array();
-        $prevArray = &$rootArray;
         $prevLevel = 0;
         $levelArray[0] = &$rootArray;
         foreach(preg_split("/\n/",$data) as $line){
@@ -88,7 +88,7 @@
         return $rootArray;
     }
 
-    public function 
addChildrenToMenuItemFromArrayData(&$rootMenuItem,$arrayData)
+    public function addChildrenToMenuItemFromArrayData(MenuItem 
&$rootMenuItem,$arrayData)
     {
         foreach ($arrayData as $key => $val) {
             if (is_string($key)) {
@@ -109,11 +109,7 @@
     }
 
     private static function cleanupData($data){
-        for($x = 0; $x < 2; $x++){
-            $data = self::removeLineBreaksFromStartOfString($data);
-            $data = strrev($data);
-        }
-        return $data;
+        return trim($data,"\n ");
     }
 
     private static function removeLineBreaksFromStartOfString($data)
@@ -124,4 +120,4 @@
         return $data;
     }
 
-}
\ No newline at end of file
+}


_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs