Updated base selector

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@15861 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/gosa-core/include/class_baseSelector.inc b/gosa-core/include/class_baseSelector.inc
index ba182b7f71c4042f4d582938186a37f2c070504f..f2a852abe0d163750bc309078dfc8417943804b5 100644 (file)
--- a/gosa-core/include/class_baseSelector.inc
+++ b/gosa-core/include/class_baseSelector.inc
@@ -185,8 +185,8 @@ class baseSelector {
       }
       $selected= $this->base == $base?" class='treeListSelected'":"";
       $link= "onclick=\"\$('bs_rebase_".$this->pid."').value='".base64_encode($base)."';$('submit_tree_base_".$this->pid."').click();\"";
-      $this->tree.= "<li><a$selected $link>".
-                    image($config->department_info[$base]['img'])."&nbsp;".
+      $this->tree.= "<li>".
+                    image($config->department_info[$base]['img'])."&nbsp;<a$selected $link>".
                     $this->gennonbreaks($config->department_info[$base]['name']).
                     ($config->department_info[$base]['description']==''?'':'&nbsp;<span class="informal">['.$this->gennonbreaks($config->department_info[$base]['description']).']</span>').
                     "</a>";

diff --git a/gosa-core/update-gosa b/gosa-core/update-gosa
index 1a9a0f1d9e4069e2cd96afa988fdce20d5a4c270..c94fe9809fc0b7fc9212729fc86ed57d57cf831b 100755 (executable)
--- a/gosa-core/update-gosa
+++ b/gosa-core/update-gosa
@@ -562,7 +562,7 @@ function rescan_images($path, $theme)
          }
 
          // New image if it is not already one
-         if (preg_match('/new/', $indexPath)) {
+         if (preg_match('/new/', $indexPath) && !preg_match('/new\.png$/', $indexPath)) {
            echo "!";
            $warnings[]= "Warning: skipped possible *new* image $path";
            flush();