[wellwell-devel] [SCM] Interchange wellwell catalog branch, master, updated. b039fcf7f78e17d97cf1f67f8a77eff2a74553d1

[Stefan Hornburg]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Interchange wellwell catalog".

The branch, master has been updated
       via  b039fcf7f78e17d97cf1f67f8a77eff2a74553d1 (commit)
      from  e0bc3555ec04d36f9c360b1716d4c76c9781ba0a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit b039fcf7f78e17d97cf1f67f8a77eff2a74553d1
Author: Stefan Hornburg (Racke) <racke at linuxia.de>
Date:   Mon May 4 16:41:25 2009 +0200

    use the form name supplied in the name attribute instead of the component name

-----------------------------------------------------------------------

Summary of changes and diff:
 code/compose.tag |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/code/compose.tag b/code/compose.tag
index 66b696e..53eae9a 100644
--- a/code/compose.tag
+++ b/code/compose.tag
@@ -37,12 +37,16 @@ sub {
 			dots2hash(\%forms, $opt->{forms}->{$k}, split /\./, $k);
 		}
 
+		my $name;
+
 		for my $k (keys %forms) {
-			if ($Scratch->{forms}->{$k}) {
+			$name = $forms{$k}->{name};
+
+			if ($Scratch->{forms}->{$name}) {
 				# form intercepted by autoload
-				$forms{$k}->{content} = $Scratch->{forms}->{$k};
+				$forms{$k}->{content} = $Scratch->{forms}->{$name};
 			} else {
-				$forms{$k}->{content} = $Tag->form({name => $k,
+				$forms{$k}->{content} = $Tag->form({name => $name,
 					template => $forms{$k}->{template}});
 			}
 		}


hooks/post-receive
-- 
Interchange wellwell catalog