From d3c7896ba707760b618bb7552156b4558a8df4ec Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Thu, 1 Sep 2011 11:14:50 -0400
Subject: [PATCH] Fix for Bug 6458 - incorrect parsing result in translation processing
Content-Type: text/plain; charset="utf-8"

Fixing improperly nested template logic inside HTML tags in MARC
editor. Modifying script to stop tag attribute markup from being
passed to the template directly in favor of using template logic.
---
 cataloguing/addbiblio.pl                           |    2 +-
 .../prog/en/modules/cataloguing/addbiblio.tt       |    8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/cataloguing/addbiblio.pl b/cataloguing/addbiblio.pl
index 637d82d..21601e9 100755
--- a/cataloguing/addbiblio.pl
+++ b/cataloguing/addbiblio.pl
@@ -874,7 +874,7 @@ foreach my $thisframeworkcode ( keys %$frameworks ) {
 		frameworktext => $frameworks->{$thisframeworkcode}->{'frameworktext'},
 	);
 	if ($frameworkcode eq $thisframeworkcode){
-		$row{'selected'}="selected=\"selected\"";
+		$row{'selected'} = 1;
 		}
 	push @frameworkcodeloop, \%row;
 } 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt
index 09bf2d6..baa84c7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt
@@ -778,8 +778,12 @@ function unHideSubfield(index,labelindex) { // FIXME :: is it used ?
 			<li id="changeframework"><label for="Frameworks">Change framework: </label>
 			<select name="Frameworks" id="Frameworks" onchange="Changefwk(this);">
 			                <option value="Default">Default</option>
-							[% FOREACH frameworkcodeloo IN frameworkcodeloop %]                                             
-                                <option value="[% frameworkcodeloo.value %]" [% frameworkcodeloo.selected %]>
+							[% FOREACH frameworkcodeloo IN frameworkcodeloop %]
+                                [% IF ( frameworkcodeloo.selected ) %]
+                                    <option value="[% frameworkcodeloo.value %]" selected="selected">
+                                [% ELSE %]
+                                    <option value="[% frameworkcodeloo.value %]">
+                                [% END %]
 					             [% frameworkcodeloo.frameworktext %]                                      
                                  </option>                          
 					        [% END %]
-- 
1.7.3