From: Galen Charlton <galen.charlton@liblime.com>
Date: Fri, 22 May 2009 12:41:22 +0000 (-0500)
Subject: followup to previous patch - don't use TMPL_IF EXPR
X-Git-Tag: v3.00.04~498
X-Git-Url: http://git.rot13.org/?a=commitdiff_plain;h=493cb8c6510410bec834c4832aa0c0d760b7fca2;hp=868d21d9059d780863dfda58733068ff00cf1dd4;p=koha.git

followup to previous patch - don't use TMPL_IF EXPR

Because of the way that HTML::Template::Pro evaluates
expressions, any variable referred to in a TMPL_IF EXPR
must be be present when the template is parsed, otherwise
you get Apache error log warnings like this:

non-initialized variable new_subfield

For a simple flag check, TMPL_IF NAME="new_subfield" is sufficient.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
---

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl
index 24ee745611..55b3a4b377 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl
@@ -89,7 +89,7 @@
     <!-- TMPL_LOOP NAME="loop" --> 
         <div id="sub<!-- TMPL_VAR NAME="urisubfieldcode" -->field">
         
-               <fieldset class="rows"><legend><!-- TMPL_IF EXPR="new_subfield eq 1" -->Add new subfield<!-- TMPL_ELSE -->Basic constraints<!-- /TMPL_IF --></legend>
+               <fieldset class="rows"><legend><!-- TMPL_IF "new_subfield" -->Add new subfield<!-- TMPL_ELSE -->Basic constraints<!-- /TMPL_IF --></legend>
                 	<ol>
                 		<!-- TMPL_IF EXPR="subfieldcode eq 0 || subfieldcode" --> 
                 		<li><span class="label">Subfield code:</span> <!-- TMPL_VAR NAME="subfieldcode" --> <input type="hidden" name="tagsubfield" value="<!-- TMPL_VAR NAME="subfieldcode" -->" /></li>