Index: openacs-4/packages/acs-tcl/tcl/00-database-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/00-database-procs.tcl,v
diff -u -r1.88.2.10 -r1.88.2.11
--- openacs-4/packages/acs-tcl/tcl/00-database-procs.tcl	22 Sep 2016 17:30:35 -0000	1.88.2.10
+++ openacs-4/packages/acs-tcl/tcl/00-database-procs.tcl	15 Nov 2016 01:25:12 -0000	1.88.2.11
@@ -2100,13 +2100,10 @@
     }
 
     if { [info exists column_array] } {
-        for { set i 0 } { $i < [ns_set size $selection] } { incr i } {
-            set array_val([ns_set key $selection $i]) [ns_set value $selection $i]
-        }
+        array set array_val [ns_set array $selection]
     } elseif { ![info exists column_set] } {
         for { set i 0 } { $i < [ns_set size $selection] } { incr i } {
-            upvar 1 [ns_set key $selection $i] return_value
-            set return_value [ns_set value $selection $i]
+            uplevel 1 [list set [ns_set key $selection $i] [ns_set value $selection $i]]
         }
     }