* fix CONTEXTSTRARR in the register call and the useage places.

diff --git a/webcit/static/t/room/edit/shared_room_removal.html b/webcit/static/t/room/edit/shared_room_removal.html
index 5dd132c09ff23ee2b05207d1478d3109742a5edf..331876ce0c3cd1d4a7070dbe772a6b75d677e512 100644 (file)
--- 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 3721633d73239ebe5608ae4e6dc59644e8c398db..ec03f18c07ac0ae3bb39bfc25761c41b7ec1e46d 100644 (file)
--- 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);