Index: openacs-4/packages/acs-lang/tcl/lang-catalog-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/tcl/lang-catalog-procs.tcl,v
diff -u -N -r1.47 -r1.48
--- openacs-4/packages/acs-lang/tcl/lang-catalog-procs.tcl	18 Apr 2008 06:48:42 -0000	1.47
+++ openacs-4/packages/acs-lang/tcl/lang-catalog-procs.tcl	13 Feb 2009 20:10:21 -0000	1.48
@@ -233,7 +233,7 @@
     set message_list [list]
 
     all_messages_for_package_and_locale $package_key $locale
-    template::util::multirow_foreach all_messages {
+    template::multirow foreach all_messages {
         lappend message_list @all_messages.message_key@ @all_messages.message@
     }
 
@@ -404,7 +404,7 @@
 		set messages_list [list]
 		set descriptions_list [list]
 		all_messages_for_package_and_locale $package_key $locale
-		template::util::multirow_foreach all_messages {
+		template::multirow foreach all_messages {
 		    lappend messages_list @all_messages.message_key@ @all_messages.message@
 		    lappend descriptions_list @all_messages.message_key@ @all_messages.description@
 		}
Index: openacs-4/packages/acs-templating/tcl/query-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/query-procs.tcl,v
diff -u -N -r1.28 -r1.29
--- openacs-4/packages/acs-templating/tcl/query-procs.tcl	7 Oct 2008 23:26:45 -0000	1.28
+++ openacs-4/packages/acs-templating/tcl/query-procs.tcl	13 Feb 2009 20:10:21 -0000	1.29
@@ -680,6 +680,10 @@
     set multirow_level_up $ulevel
   } else {
     set multirow_level_up \#[adp_level]
+    if { $multirow_level_up eq "\#" } {
+      # in event adp_level not defined we are calling either at install so up 1.
+      set multirow_level_up 1
+    }
   }
   
   switch -exact $command {
@@ -813,7 +817,6 @@
     
     foreach {
       set code_block [lindex $args 0]
-      
       upvar $multirow_level_up $name:rowcount rowcount $name:columns columns
 
       if {![info exists rowcount] || ![info exists columns]} { 
Index: openacs-4/packages/acs-templating/www/doc/exercise/list-and-var-sample.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/exercise/list-and-var-sample.tcl,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/acs-templating/www/doc/exercise/list-and-var-sample.tcl	10 Jan 2007 21:22:13 -0000	1.4
+++ openacs-4/packages/acs-templating/www/doc/exercise/list-and-var-sample.tcl	13 Feb 2009 20:10:21 -0000	1.5
@@ -80,13 +80,13 @@
 
 set friends:1(extra_column) "${friends:1(first_names)} is da bomb totally"
 
-template::util::multirow_foreach friends {
+template::multirow foreach friends {
     set friends.extra_column "@friends.first_names@ is a good person"
 }
 
 template::multirow extend friends another_column
 
-template::util::multirow_foreach friends {
+template::multirow foreach friends {
   if {[info exists friends.extra_column]} {
     set friends.another_column "there is stuff in dere"
   } else {