Fixed dialog ignore account state

[gosa.git] / gosa-core / update-gosa

diff --git a/gosa-core/update-gosa b/gosa-core/update-gosa
index 1a9a0f1d9e4069e2cd96afa988fdce20d5a4c270..2e54a2aa91df52e7754e3796cd2081bbfb45c1cb 100755 (executable)
--- a/gosa-core/update-gosa
+++ b/gosa-core/update-gosa
@@ -551,7 +551,7 @@ function rescan_images($path, $theme)
       // We're only interested in png files
       $indexPath= substr($fileInfo->getPathname(), $baseLength + 1);
       $path= $fileInfo->getPathname();
-      if (preg_match('/\.png$/', $indexPath) && !preg_match('/\.svn/', $path) && !preg_match('/themes\/[^\/]+\/img.png$/', $path)){
+      if (preg_match('/\.png$/', $indexPath) && !preg_match('/\.svn/', $path) && !preg_match('/themes\/[^\/]+\/images\/img.png$/', $path)){
   
          // Grey image if it is not already one
          if (preg_match('/grey/', $indexPath)) {
@@ -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();
@@ -739,7 +739,7 @@ function rescan_images($path, $theme)
     $styles[$imagePath]= $styles[$realPath];
   }
 
-  imagePNG($dst, "html/themes/$theme/img.png", 9);
+  imagePNG($dst, "html/themes/$theme/images/img.png", 9);
   imageDestroy($dst);
 
   // Show warnings images