From: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
Date: Tue, 20 Oct 2009 09:26:06 +0000 (+0200)
Subject: followup bug fix 3712
X-Git-Tag: v3.00.04_final~5
X-Git-Url: http://git.rot13.org/?p=koha.git;a=commitdiff_plain;h=d3795b1d15ab11b592e493678745e40d2eab58aa

followup bug fix 3712

thanks Zeno Tajoli
---

diff --git a/admin/systempreferences.pl b/admin/systempreferences.pl
index 904fb4b940..55a35e2709 100755
--- a/admin/systempreferences.pl
+++ b/admin/systempreferences.pl
@@ -116,7 +116,7 @@ $tabsysprefs{Stemming}                    = "Cataloging";
 $tabsysprefs{WeightFields}                = "Cataloging";
 $tabsysprefs{NoZebra}                     = "Cataloging";
 $tabsysprefs{NoZebraIndexes}              = "Cataloging";
-$tabsysprefs{ReceiveBackIssues}           = "Cataloging";
+#$tabsysprefs{ReceiveBackIssues}           = "Cataloging";
 $tabsysprefs{DefaultClassificationSource} = "Cataloging";
 $tabsysprefs{RoutingSerials}              = "Cataloging";
 $tabsysprefs{'item-level_itypes'}         = "Cataloging";
@@ -171,7 +171,7 @@ $tabsysprefs{checkdigit}                   = "Patrons";
 $tabsysprefs{intranetreadinghistory}       = "Patrons";
 $tabsysprefs{NotifyBorrowerDeparture}      = "Patrons";
 $tabsysprefs{memberofinstitution}          = "Patrons";
-$tabsysprefs{ReadingHistory}               = "Patrons";
+#$tabsysprefs{ReadingHistory}               = "Patrons";
 $tabsysprefs{BorrowerMandatoryField}       = "Patrons";
 $tabsysprefs{borrowerRelationship}         = "Patrons";
 $tabsysprefs{BorrowersTitles}              = "Patrons";
@@ -218,6 +218,7 @@ $tabsysprefs{AWSPrivateKey}          = "EnhancedContent";
 $tabsysprefs{AmazonLocale}           = "EnhancedContent";
 $tabsysprefs{AmazonAssocTag}         = "EnhancedContent";
 $tabsysprefs{AmazonSimilarItems}     = "EnhancedContent";
+$tabsysprefs{OPACAmazonCoverImages}  = "EnhancedContent";
 $tabsysprefs{OPACAmazonContent}      = "EnhancedContent";
 $tabsysprefs{OPACAmazonSimilarItems} = "EnhancedContent";
 
diff --git a/installer/data/mysql/updatedatabase30.pl b/installer/data/mysql/updatedatabase30.pl
index 00fa2e76bb..6d450a79cc 100644
--- a/installer/data/mysql/updatedatabase30.pl
+++ b/installer/data/mysql/updatedatabase30.pl
@@ -598,6 +598,23 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
     SetVersion ($DBversion);
 }  
 
+$DBversion = "3.00.04.019";
+if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
+    my $authdisplayhierarchy = C4::Context->preference('AuthDisplayHierarchy');
+    if ($authdisplayhierarchy < 1){
+       $dbh->do("INSERT IGNORE INTO systempreferences (variable,value,explanation,options,type)VALUES('AuthDisplayHierarchy','0','To display authorities in a hierarchy way. Put ON only if you have a thesaurus. Default is OFF','','YesNo')");
+    };
+
+    my $opacamazon = C4::Context->preference('OPACAmazonCoverImages');
+    if ($opacamazon < 1){
+       $dbh->do("INSERT IGNORE INTO systempreferences (variable,value,explanation,options,type)VALUES('OPACAmazonCoverImages','0','Display cover images on OPAC from Amazon Web Services. Default is OFF','','YesNo')");
+    };
+
+    print "Upgrade to $DBversion done (new AuthDisplayHierarchy, )\n";
+    SetVersion ($DBversion);
+}  
+
+
 =item DropAllForeignKeys($table)
 
   Drop all foreign keys of the table $table
diff --git a/kohaversion.pl b/kohaversion.pl
index cbe5173fe1..62e07709c8 100644
--- a/kohaversion.pl
+++ b/kohaversion.pl
@@ -10,7 +10,7 @@
 use strict;
 
 sub kohaversion {
-    our $VERSION = '3.00.04.018';
+    our $VERSION = '3.00.04.019';
     # version needs to be set this way
     # so that it can be picked up by Makefile.PL
     # during install