From 8f7bbdaa5dc24919c4eb2583d7120951589029d4 Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Sun, 15 Aug 2010 23:23:49 -0700
Subject: [PATCH] Fixes bug #11780: anchor filename regex to the end of the
 string.

---
 docs/changelog/7.x.x.txt            |  1 +
 lib/WebGUI/Asset/File/ZipArchive.pm |  3 ++-
 t/Asset/File/ZipArchive.t           | 11 ++++++++++-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index d3678fa4a..c4290495a 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -1,6 +1,7 @@
 7.9.13
  - fixed #11783: Instances deleted during realtime run
  - fixed #11781: Thingy wrong retorn value from Ajax method
+ - fixed #11780: fixFilenames regex needs an anchor in ZipArchive asset
 
 7.9.12
  - webgui.org homepage gives 404  (#11778)
diff --git a/lib/WebGUI/Asset/File/ZipArchive.pm b/lib/WebGUI/Asset/File/ZipArchive.pm
index bbe0f2b96..25306bc7d 100644
--- a/lib/WebGUI/Asset/File/ZipArchive.pm
+++ b/lib/WebGUI/Asset/File/ZipArchive.pm
@@ -172,7 +172,8 @@ sub fixFilenames {
         my $extension = $storage->getFileExtension($file);
         next FILE unless isIn($extension, qw/pl perl pm cgi php asp sh/);
         my $newFile = $file;
-        $newFile =~ s/\.$extension/_$extension.txt/;
+        #$newFile =~ s/\.$extension$/_$extension.txt/;
+        $newFile =~ s/\.$extension$/_$extension.txt/;
         $storage->renameFile($file, $newFile);
     }
 }
diff --git a/t/Asset/File/ZipArchive.t b/t/Asset/File/ZipArchive.t
index 5f4e615bf..76e6e31ca 100644
--- a/t/Asset/File/ZipArchive.t
+++ b/t/Asset/File/ZipArchive.t
@@ -19,7 +19,7 @@ use WebGUI::Asset::File::ZipArchive;
 use WebGUI::Test;
 use Test::More; # increment this value for each test you create
 use Test::Deep;
-plan tests => 2;
+plan tests => 3;
 
 my $session = WebGUI::Test->session;
 
@@ -42,3 +42,12 @@ cmp_bag(
     [ qw{ extensions.tar extension_pm.txt extension_perl.txt extension.html extensions extensions/extension.html }], 
     'files after fixFilenames, html files left alone'
 );
+
+$storage->addFileFromScalar('file.pm.pm','content');
+$arch->fixFilenames();
+
+cmp_bag(
+    $storage->getFiles, 
+    [ qw{ extensions.tar extension_pm.txt extension_perl.txt extension.html extensions extensions/extension.html file_pm.pm.txt}], 
+    'fixFilenames: anchors replacements to the end of the string'
+);