Attachment 34697 Details for Bug 13285 – [PASSED QA] Bug 13285 Do the right thing if opacthemes is not set

[patch] [PASSED QA] Bug 13285 Do the right thing if opacthemes is not set

PASSED-QA-Bug-13285-Do-the-right-thing-if-opacthem.patch (text/plain), 1.40 KB, created by Katrin Fischer on 2014-12-27 10:18:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Katrin Fischer

Created: 2014-12-27 10:18:16 UTC

Size: 1.40 KB

patch

obsolete

>From 921b8551aa6edda052075290e4178753cebd699e Mon Sep 17 00:00:00 2001
>From: Colin Campbell <colin.campbell@ptfs-europe.com>
>Date: Tue, 18 Nov 2014 14:07:49 +0000
>Subject: [PATCH] [PASSED QA] Bug 13285 Do the right thing if opacthemes is not
> set
>
>If opacthemes is not defined updatedatabase reports the
>subsequent warnings as an error. Take account of the case where
>it is not set and default that to bootstrap.
>
>This is probably a rare occurence, but should be handled
>
>Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
>
>Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
>---
> installer/data/mysql/updatedatabase.pl | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
>index b06142c..b85dbb8 100755
>--- a/installer/data/mysql/updatedatabase.pl
>+++ b/installer/data/mysql/updatedatabase.pl
>@@ -8922,7 +8922,7 @@ if ( CheckVersion($DBversion) ) {
> $DBversion = "3.17.00.040";
> if ( CheckVersion($DBversion) ) {
>     my $opac_theme = C4::Context->preference( 'opacthemes' );
>-    if ( $opac_theme eq 'prog' || $opac_theme eq 'ccsr' ) {
>+    if ( !defined $opac_theme || $opac_theme eq 'prog' || $opac_theme eq 'ccsr' ) {
>         $dbh->do("UPDATE systempreferences SET value='bootstrap' WHERE variable='opacthemes'");
>     }
>     print "Upgrade to $DBversion done (Bug 12223: 'prog' and 'ccsr' themes removed)\n";
>-- 
>1.9.1

Actions: View | Diff | Splinter Review

Attachments on bug 13285: 33652 | 34622 | 34697