Fixes two bugs affecting Web installer when used with Unimarc/French

Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>

diff --git a/C4/Languages.pm b/C4/Languages.pm
index 562a644..e4d95fc 100644 (file)
--- a/C4/Languages.pm
+++ b/C4/Languages.pm
@@ -233,7 +233,7 @@ sub _get_language_dirs {
         next if $language =~/css$/;
         next if $language =~/CVS$/;
         next if $language =~/\.txt$/i;     #Don't read the readme.txt !
-               next if $language =~/img/;
+               next if $language =~/img|images/;
         push @languages, $language;
     }
         return (@languages);

diff --git a/installer/install.pl b/installer/install.pl
index 7c18138..f3c1a19 100755 (executable)
--- a/installer/install.pl
+++ b/installer/install.pl
@@ -407,7 +407,7 @@ elsif ( $step && $step == 3 ) {
             # we can have some variants of marc flavour, by having different directories, like : unimarc_small and unimarc_full, for small and complete unimarc frameworks.
             # marc_cleaned finds the marcflavour, without the variant.
             my $marc_cleaned = 'MARC21';
-            $marc_cleaned = 'UNIMARC' if $marcflavour =~ /unimarc/;
+            $marc_cleaned = 'UNIMARC' if $marcflavour =~ /unimarc/i;
           my $request =
             $dbh->prepare(
               "INSERT IGNORE INTO `systempreferences` (variable,value,explanation,options,type) VALUES('marcflavour','$marc_cleaned','Define global MARC flavor (MARC21 or UNIMARC) used for character encoding','MARC21|UNIMARC','Choice');"