Attachment 34622 Details for Bug 13285 – Bug 13285 Do the right thing if opacthemes is not set

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

Bug-13285-Do-the-right-thing-if-opacthemes-is-not-.patch (text/plain), 1.33 KB, created by Chris Cormack on 2014-12-22 06:56:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Cormack

Created: 2014-12-22 06:56:05 UTC

Size: 1.33 KB

patch

obsolete

>From dbbe2ad24560aa9d58e248184051b9259dbb144f 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] 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>
>---
> 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";
>-- 
>2.1.0

Actions: View | Diff | Splinter Review

Attachments on bug 13285: 33652 | 34622 | 34697