Attachment 33652 Details for Bug 13285 – Proposed patch

[patch] Proposed patch

0001-Bug-13285-Do-the-right-thing-if-opacthemes-is-not-se.patch (text/plain), 1.27 KB, created by Colin Campbell on 2014-11-18 14:13:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Colin Campbell

Created: 2014-11-18 14:13:25 UTC

Size: 1.27 KB

patch

obsolete

>From 54aed44d7dad2e1dceb3f5e0f7dd0b371c3c075e 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
>---
> 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 e36c20e..6d06e0d 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.3
>

Actions: View | Diff | Splinter Review

Attachments on bug 13285: 33652 | 34622 | 34697