Merge remote branch 'upstream/master'

1 files changed, 7 insertions, 6 deletions

diff --git a/inc/html.php b/inc/html.php
index de860a0fe..6e9cce7df 100644
--- a/inc/html.php
+++ b/inc/html.php
@@ -782,16 +782,17 @@ function html_buildlist($data,$class,$func,$lifunc='html_li_default'){
         return '';
     }
 
-    $level = $data[0]['level'];
-    $opens = 0;
+    $start_level = $data[0]['level'];
     $ret   = '';
 
-    if ($level < 2) {
+    if ($start_level < 2) {
         // Trigger building a wrapper ul if the first level is
         // 0 (we have a root object) or 1 (just the root content)
-        --$level;
+        --$start_level;
     }
 
+    $level = $start_level;
+
     foreach ($data as $item){
 
         if( $item['level'] > $level ){
@@ -824,7 +825,7 @@ function html_buildlist($data,$class,$func,$lifunc='html_li_default'){
     }
 
     //close remaining items and lists
-    for ($i=0; $i < $level; $i++){
+    while(--$level >= $start_level) {
         $ret .= "</li></ul>\n";
     }
 
@@ -1258,7 +1259,7 @@ function html_edit(){
         $form->addElement(form_makeOpenTag('div', array('class'=>'license')));
         $out  = $lang['licenseok'];
         $out .= ' <a href="'.$license[$conf['license']]['url'].'" rel="license" class="urlextern"';
-        if(isset($conf['target']['extern'])) $out .= ' target="'.$conf['target']['extern'].'"';
+        if($conf['target']['extern']) $out .= ' target="'.$conf['target']['extern'].'"';
         $out .= '>'.$license[$conf['license']]['name'].'</a>';
         $form->addElement($out);
         $form->addElement(form_makeCloseTag('div'));