From 6f583f2b17128bd518df8de628c0c201a6e2c200 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Wilfried=20G=C3=B6esgens?= <willi@citadel.org>
Date: Sat, 14 Aug 2010 11:28:43 +0000
Subject: [PATCH] * fix CONTEXTSTRARR in the register call and the useage
 places.

---
 webcit/static/t/room/edit/shared_room_removal.html | 8 ++++----
 webcit/subst.c                                     | 3 ++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/webcit/static/t/room/edit/shared_room_removal.html b/webcit/static/t/room/edit/shared_room_removal.html
index 5dd132c09..331876ce0 100644
--- a/webcit/static/t/room/edit/shared_room_removal.html
+++ b/webcit/static/t/room/edit/shared_room_removal.html
@@ -1,18 +1,18 @@
 <script type="text/javascript">
 /*
 TODO: hide from the other table the column with this ID:
-ignet_share_node_add__<?CONTEXTARR(#"GNET_IGNET_NODE", "U")>
+ignet_share_node_add__<?CONTEXTSTRARR(#"GNET_IGNET_NODE", "U")>
 */
 </script>
 <form method="post" action="netedit">
 	<input type="hidden" name="nonce" value="<?NONCE>" />
 	<tr>
-		<td><?CONTEXTARR(#"GNET_IGNET_NODE")></td>
-		<td><?CONTEXTARR(#"GNET_IGNET_ROOM")></td>
+		<td><?CONTEXTSTRARR(#"GNET_IGNET_NODE")></td>
+		<td><?CONTEXTSTRARR(#"GNET_IGNET_ROOM")></td>
 		<td>
 			<input type="hidden" 
 			       name="line" 
-			       value="ignet_push_share|<?CONTEXTARR(#"GNET_IGNET_ROOM", "U")>|<?CONTEXTARR(#"GNET_IGNET_ROOM", "U")>"
+			       value="ignet_push_share|<?CONTEXTSTRARR(#"GNET_IGNET_ROOM", "U")>|<?CONTEXTSTRARR(#"GNET_IGNET_ROOM", "U")>"
 			/>
 			<input type="hidden" name="tab" value="sharing" />
 			<input type="hidden" name="cmd" value="remove" />
diff --git a/webcit/subst.c b/webcit/subst.c
index 3721633d7..ec03f18c0 100644
--- a/webcit/subst.c
+++ b/webcit/subst.c
@@ -3050,7 +3050,7 @@ InitModule_SUBST
 	RegisterNamespace("SORT:ORDER", 1, 2, tmplput_SORT_ORDER, NULL, CTX_NONE);
 	RegisterNamespace("SORT:NEXT", 1, 2, tmplput_SORT_NEXT, NULL, CTX_NONE);
 	RegisterNamespace("CONTEXTSTR", 0, 1, tmplput_ContextString, NULL, CTX_STRBUF);
-	RegisterNamespace("CONTEXTSTRARR", 1, 2, tmplput_ContextStringArray, NULL, CTX_STRBUF);
+	RegisterNamespace("CONTEXTSTRARR", 1, 2, tmplput_ContextStringArray, NULL, CTX_STRBUFARR);
 	RegisterNamespace("ITERATE", 2, 100, tmpl_iterate_subtmpl, preeval_iterate, CTX_NONE);
 	RegisterNamespace("DOBOXED", 1, 2, tmpl_do_boxed, NULL, CTX_NONE);
 	RegisterNamespace("DOTABBED", 2, 100, tmpl_do_tabbed, preeval_do_tabbed, CTX_NONE);
@@ -3062,6 +3062,7 @@ InitModule_SUBST
 	RegisterConditional(HKEY("COND:CONTEXTSTRARR"), 4, ConditionalContextStrinArray, CTX_STRBUFARR);
 	RegisterConditional(HKEY("COND:LONGVECTOR"), 4, ConditionalLongVector, CTX_LONGVECTOR);
 
+
 	RegisterControlConditional(HKEY("COND:ITERATE:ISGROUPCHANGE"), 2, 
 				   conditional_ITERATE_ISGROUPCHANGE, 
 				   CTX_ITERATE);
-- 
2.30.2