Koha-community/Koha
15
7
Fork 0
Code Issues Releases Wiki Activity

Bug 13618: Fix error 'Not a GLOB reference'

Browse source 
The interpolation of a variable on including a file caused an unexpected
error:
Template process failed: undef error - Not a GLOB reference at
/usr/lib/i386-linux-gnu/perl5/5.20/Template/Provider.pm line 619.

The easier fix is to replace it with a SWITCH.

Signed-off-by: Signed-off-by: Joonas Kylmälä <j.kylmala@gmail.com>

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
This commit is contained in:
Jonathan Druart 2015-08-04 15:51:55 +01:00 committed by Brendan Gallagher
parent d254362435
commit 602bdbab4c
2 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
View file

@ -13,10 +13,11 @@
<li id="patronbasics"><img src="[% interface %]/[% theme %]/img/patron-blank.png" alt="[% firstname %] [% surname %] ([% cardnumber %])" border="0" style="margin: .3em 0 .3em .3em; padding: .2em; border: 1px solid #CCCCCC;" /></li>
[% END %]
[% END %]
[% IF Koha.Preference( 'AddressFormat' ) %]
[% INCLUDE "member-display-address-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %]
[% ELSE %]
[% INCLUDE 'member-display-address-style-us.inc' %]
[% SWITCH Koha.Preference( 'AddressFormat' ) %]
[% CASE 'de' %]
[% INCLUDE 'member-display-address-style-de.inc' %]
[% CASE # us %]
[% INCLUDE 'member-display-address-style-us.inc' %]
[% END %]
[% IF ( phone ) %]<li class="patronphone">

9
koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
View file

@ -199,10 +199,11 @@ function validate1(date) {
[% UNLESS ( I ) %][% IF ( othernames ) %]&ldquo;[% othernames %]&rdquo;[% END %]
<div class = "address">
[% IF Koha.Preference( 'AddressFormat' ) %]
[% INCLUDE "member-display-address-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %]
[% ELSE %]
[% INCLUDE 'member-display-address-style-us.inc' %]
[% SWITCH Koha.Preference( 'AddressFormat' ) %]
[% CASE 'de' %]
[% INCLUDE 'member-display-address-style-de.inc' %]
[% CASE # us %]
[% INCLUDE 'member-display-address-style-us.inc' %]
[% END %]
</div>