Attachment 21251 Details for Bug 10915 – Bug 10915 - about->timeline broken on upgraded Koha

[patch] Bug 10915 - about->timeline broken on upgraded Koha

Bug-10915---about-timeline-broken-on-upgraded-Koha.patch (text/plain), 1.24 KB, created by Tomás Cohen Arazi (tcohen) on 2013-09-19 15:02:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tomás Cohen Arazi (tcohen)

Created: 2013-09-19 15:02:00 UTC

Size: 1.24 KB

patch

obsolete

>From 84719a1d059b509380e43b3e03f86ca825871bb7 Mon Sep 17 00:00:00 2001
>From: Mason James <mtj@kohaaloha.com>
>Date: Fri, 20 Sep 2013 00:06:20 +1200
>Subject: [PATCH] Bug 10915 - about->timeline broken on upgraded Koha
>
>Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
>Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
>Fixes dev and standard installs without docdic tag in koha-conf.xml.
>Doesn't break when docdir present either. Warning still present
>on packages install that didn't add the docdir definition in koha-conf.xml
>---
> about.pl |   10 +++++++++-
> 1 file changed, 9 insertions(+), 1 deletion(-)
>
>diff --git a/about.pl b/about.pl
>index ef45340..0ba7291 100755
>--- a/about.pl
>+++ b/about.pl
>@@ -148,7 +148,15 @@ $template->param( table => $table );
> ## Koha time line code
> 
> #get file location
>-my $docdir = C4::Context->config('docdir');
>+my $docdir;
>+if ( defined C4::Context->config('docdir') ) {
>+    $docdir = C4::Context->config('docdir');
>+} else {
>+    # if no <docdir> is defined in koha-conf.xml, use the default location
>+    # this is a work-around to stop breakage on upgraded Kohas, bug 8911
>+    $docdir = C4::Context->config('intranetdir') . '/docs';
>+}
>+
> open( my $file, "<", "$docdir" . "/history.txt" );
> my $i = 0;
> 
>-- 
>1.7.9.5

Actions: View | Diff | Splinter Review

Attachments on bug 10915: 21237 | 21238 | 21239 | 21251 | 21253