r161 - trunk/debian/patches

[Boro Sitnikovski]

Author: bor0-guest
Date: 2012-06-20 18:44:41 +0000 (Wed, 20 Jun 2012)
New Revision: 161

Modified:
   trunk/debian/patches/37_bins_thumbnails
Log:
fixed wrong escape for #196310

Modified: trunk/debian/patches/37_bins_thumbnails
===================================================================
--- trunk/debian/patches/37_bins_thumbnails	2012-06-18 22:43:03 UTC (rev 160)
+++ trunk/debian/patches/37_bins_thumbnails	2012-06-20 18:44:41 UTC (rev 161)
@@ -8,24 +8,24 @@
          my $albumdir2 = File::Spec->rel2abs(".");
          chdir($pwd);
  
-+        if (! -d "$albumdir\/thumbs") {
-+            mkdir "$albumdir\/thumbs", 0755
-+                or die("\nCannot create $albumdir\/thumbs: $?");
++        if (! -d "$albumdir/thumbs") {
++            mkdir "$albumdir/thumbs", 0755
++                or die("\nCannot create $albumdir/thumbs: $?");
 +        }
 +
-+        if (! -d "$albumdir\/thumbs\/Lg") {
-+            mkdir "$albumdir\/thumbs\/Lg", 0755
-+                or die("\nCannot create $albumdir\/thumbs\/Lg: $?");
++        if (! -d "$albumdir/thumbs/Lg") {
++            mkdir "$albumdir/thumbs/Lg", 0755
++                or die("\nCannot create $albumdir/thumbs/Lg: $?");
 +        }
 +
-+        if (! -d "$albumdir\/thumbs\/Med") {
-+            mkdir "$albumdir\/thumbs\/Med", 0755
-+                or die("\nCannot create $albumdir\/thumbs\/Med: $?");
++        if (! -d "$albumdir/thumbs/Med") {
++            mkdir "$albumdir/thumbs/Med", 0755
++                or die("\nCannot create $albumdir/thumbs/Med: $?");
 +        }
 +
-+        if (! -d "$albumdir\/thumbs\/Sm") {
-+            mkdir "$albumdir\/thumbs\/Sm", 0755
-+                or die("\nCannot create $albumdir\/thumbs\/Sm: $?");
++        if (! -d "$albumdir/thumbs/Sm") {
++            mkdir "$albumdir/thumbs/Sm", 0755
++                or die("\nCannot create $albumdir/thumbs/Sm: $?");
 +        }
 +
          #print "picdir:   $picdir2\n";
@@ -36,7 +36,7 @@
  
          #generate thumbnail (with dir if needed)
 -        my $thumbName = "$crntImageBase"."_pre.jpg";
-+        my $thumbName = "thumbs\/$crntImageBase"."_pre.jpg";
++        my $thumbName = "thumbs/$crntImageBase"."_pre.jpg";
          #$imageData[$i]{'thumblink'} = &getWebBase($album).$thumbName;
          $imageData[$i]{'thumblink'} = jssafe_uri_escape($thumbName);
  
@@ -45,7 +45,7 @@
                  my $size = $imageConfigHash->{sizeNames}[$j];
                  $size =~ s/\.//g ;
 -                $scaledImage = $crntImageBase."_".
-+                $scaledImage = "thumbs\/".$size."\/".$crntImageBase."_".
++                $scaledImage = "thumbs/".$size."/".$crntImageBase."_".
                      $size.".jpg";
                  $maxWidth = $imageConfigHash->{scaledWidths}[$j];
                  $maxHeight = $imageConfigHash->{scaledHeights}[$j];
@@ -54,7 +54,7 @@
  
              $imageData[$i]{$j}{'preloadIMG'} =
 -                jssafe_uri_escape($imageData[$nextImageNum]{'basename'})."_".
-+                "thumbs\/".$size."\/".jssafe_uri_escape($imageData[$nextImageNum]{'basename'})."_".
++                "thumbs/".$size."/".jssafe_uri_escape($imageData[$nextImageNum]{'basename'})."_".
                  $imageData[$nextImageNum]{configuration}{sizeNames}[$sizeLink].
                  ".jpg";
              $imageData[$i]{$j}{'imgNum'} = $i + 1;
@@ -63,7 +63,7 @@
                  #  &getWebBase($album).$imageData[$i]{'imagepath'}.
                  #    $scaledImage;
 -                $imageData[$i]{$j}{'sizedFile'} = $scaledImage;
-+                $imageData[$i]{$j}{'sizedFile'} = "thumbs\/".$size."\/".$scaledImage;
++                $imageData[$i]{$j}{'sizedFile'} = "thumbs/".$size."/".$scaledImage;
              }
          }