From f1af76a12bc272de33bb41c3ba5f243fe247d271 Mon Sep 17 00:00:00 2001 From: Colin Kuskie Date: Mon, 20 Sep 2010 08:48:10 -0700 Subject: [PATCH] Try cleaning out the bad spanish bare .pm file again. Fixes bug #11875. --- docs/changelog/7.x.x.txt | 1 + docs/upgrades/upgrade_7.10.0-7.10.1.pl | 12 ++++++++++++ 2 files changed, 13 insertions(+) diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index 98cf17c28..608d9e4b6 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -8,6 +8,7 @@ - fixed #11865: URL with slash no longer works. - fixed #11861: addAttachment method removed from WebGUI 7 thus breaking the API - fixed #11868: WebGUI::Session::Form::validToken throws unnecessary warnings + - fixed #11875: Error loading empty module 7.10.0 - fixed #11812: Checking www_ajaxSave's response in the cart js, urlencoding post parameters diff --git a/docs/upgrades/upgrade_7.10.0-7.10.1.pl b/docs/upgrades/upgrade_7.10.0-7.10.1.pl index 9c58d26f2..c43549801 100644 --- a/docs/upgrades/upgrade_7.10.0-7.10.1.pl +++ b/docs/upgrades/upgrade_7.10.0-7.10.1.pl @@ -32,6 +32,7 @@ my $session = start(); # this line required # upgrade functions go here uniqueProductLocations($session); +removeBadSpanishFile($session); finish($session); # this line required @@ -64,6 +65,17 @@ sub uniqueProductLocations { print "DONE!\n" unless $quiet; } +#---------------------------------------------------------------------------- +# Describe what our function does +sub removeBadSpanishFile { + my $session = shift; + print "\tRemove a bad Spanish translation file... " unless $quiet; + use File::Spec; + unlink File::Spec->catfile($webguiRoot, qw/lib WebGUi i18n Spanish .pm/); + # and here's our code + print "DONE!\n" unless $quiet; +} + #---------------------------------------------------------------------------- # Describe what our function does #sub exampleFunction {