* Revert last change to trimStars() which broke multi-level licenses like:

  * GNU
  ** GFDL
  *** GFDL|GNU Free Documentation License
* Coding style
* including {{}} in title="" e.g. title="{{GFDL}}" instead of title="GFDL"

diff --git a/includes/Licenses.php b/includes/Licenses.php
index 641405f..e63709b 100644 (file)
--- a/includes/Licenses.php
+++ b/includes/Licenses.php
@@ -75,21 +75,20 @@ class Licenses {
        
        function trimStars( $str ) {
                $i = $count = 0;
-               $len = strlen( $str );
                
-               while ($len < $i && $str[$i++] == '*')
+               wfSuppressWarnings();
+               while ($str[$i++] == '*')
                        ++$count;
-
+               wfRestoreWarnings();
+       
                return array( $count, ltrim( $str, '* ' ) );
        }
        
        function stackItem( &$list, $path, $item ) {
                $position =& $list;
-               if ( $path ) {
-                       foreach ( $path as $key ) {
+               if ( $path )
+                       foreach( $path as $key )
                                $position =& $position[$key];
-                       }
-               }
                $position[] = $item;
        }
 
@@ -110,7 +109,7 @@ class Licenses {
                                        $this->msg( $val->text ),
                                        array(
                                                'value' => $val->template,
-                                               'title' => $val->template
+                                               'title' => '{{' . $val->template . '}}'
                                        ),
                                        $depth
                                );