Index: openacs-4/packages/acs-templating/www/scripts/xinha/attach-file.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/scripts/xinha/attach-file.tcl,v
diff -u -r1.18.2.1 -r1.18.2.2
--- openacs-4/packages/acs-templating/www/scripts/xinha/attach-file.tcl	10 Sep 2015 08:22:17 -0000	1.18.2.1
+++ openacs-4/packages/acs-templating/www/scripts/xinha/attach-file.tcl	2 Jan 2016 21:57:18 -0000	1.18.2.2
@@ -36,7 +36,7 @@
 
 if {!$write_p} {
     # if parent_id does not exist yet, let's use the pacakage_id
-    if { ![db_0or1row "check_parent" "select object_id from acs_objects where object_id=:parent_id"] } {
+    if { ![db_0or1row check_parent {select object_id from acs_objects where object_id = :parent_id}] } {
         set parent_id $package_id
     }
 
Index: openacs-4/packages/acs-templating/www/scripts/xinha/attach-image.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/scripts/xinha/attach-image.tcl,v
diff -u -r1.12.2.1 -r1.12.2.2
--- openacs-4/packages/acs-templating/www/scripts/xinha/attach-image.tcl	10 Sep 2015 08:22:17 -0000	1.12.2.1
+++ openacs-4/packages/acs-templating/www/scripts/xinha/attach-image.tcl	2 Jan 2016 21:57:18 -0000	1.12.2.2
@@ -32,7 +32,7 @@
 
 if {!$write_p} {
     # if parent_id does not exist yet, let's use the pacakage_id
-    if { ![db_0or1row "check_parent" "select object_id from acs_objects where object_id=:parent_id"] } {
+    if { ![db_0or1row check_parent {select object_id from acs_objects where object_id = :parent_id}] } {
         set parent_id $package_id
     }
 
Index: openacs-4/packages/assessment/tcl/as-item-type-mc-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-item-type-mc-procs.tcl,v
diff -u -r1.26.2.1 -r1.26.2.2
--- openacs-4/packages/assessment/tcl/as-item-type-mc-procs.tcl	10 Sep 2015 08:27:58 -0000	1.26.2.1
+++ openacs-4/packages/assessment/tcl/as-item-type-mc-procs.tcl	2 Jan 2016 21:57:46 -0000	1.26.2.2
@@ -701,7 +701,7 @@
     set new_section_id [as::section::new_revision -section_id $section_id -assessment_id $assessment_id]
     set new_item_id [as::item::new_revision -as_item_id $as_item_id]
     # HAM : querried the mc_id for the given choice id
-    set mc_id [db_string "get_mc_id" "select mc_id from as_item_choices where choice_id=:choice_id"]
+    set mc_id [db_string get_mc_id {select mc_id from as_item_choices where choice_id=:choice_id}]
     #  ***********
     set new_mc_id [as::item_type_mc::new_revision -as_item_type_id $mc_id -with_choices_p f]
     as::section::update_section_in_assessment \
Index: openacs-4/packages/assessment/www/asm-admin/item-edit-mc-choices-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-edit-mc-choices-delete.tcl,v
diff -u -r1.6.2.1 -r1.6.2.2
--- openacs-4/packages/assessment/www/asm-admin/item-edit-mc-choices-delete.tcl	10 Sep 2015 08:28:05 -0000	1.6.2.1
+++ openacs-4/packages/assessment/www/asm-admin/item-edit-mc-choices-delete.tcl	2 Jan 2016 21:57:46 -0000	1.6.2.2
@@ -24,7 +24,7 @@
     set new_section_id [as::section::new_revision -section_id $section_id -assessment_id $assessment_id]
     set new_item_id [as::item::new_revision -as_item_id $as_item_id]
     # HAM : querried the mc_id for the given choice id
-    set mc_id [db_string "get_mc_id" "select mc_id from as_item_choices where choice_id=:choice_id"]
+    set mc_id [db_string get_mc_id {select mc_id from as_item_choices where choice_id = :choice_id}]
     #  ***********
     set new_mc_id [as::item_type_mc::new_revision -as_item_type_id $mc_id -with_choices_p f]
     as::section::update_section_in_assessment\
Index: openacs-4/packages/dotlrn/tcl/community-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/community-procs.tcl,v
diff -u -r1.211.2.2 -r1.211.2.3
--- openacs-4/packages/dotlrn/tcl/community-procs.tcl	11 Sep 2015 11:40:39 -0000	1.211.2.2
+++ openacs-4/packages/dotlrn/tcl/community-procs.tcl	2 Jan 2016 21:58:25 -0000	1.211.2.3
@@ -343,7 +343,11 @@
         while {1} {
             if {$parent_community_id ne ""} {
                 #admin of the parent need admin on the subcommunity.
-                set parent_admin_party [db_string "parent_admin_party" "select segment_id from rel_segments where group_id = :parent_community_id and rel_type='dotlrn_admin_rel'"]
+                set parent_admin_party [db_string parent_admin_party {
+                    select segment_id
+                    from rel_segments
+                    where group_id = :parent_community_id and rel_type='dotlrn_admin_rel'
+                }]
                 permission::grant -party_id $parent_admin_party -object_id $community_id -privilege "admin"
                 
                 #if this community has a parent we need to work up the chain.
Index: openacs-4/packages/dotlrn-news/tcl/dotlrn-news-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-news/tcl/dotlrn-news-procs.tcl,v
diff -u -r1.33.2.1 -r1.33.2.2
--- openacs-4/packages/dotlrn-news/tcl/dotlrn-news-procs.tcl	11 Sep 2015 11:40:59 -0000	1.33.2.1
+++ openacs-4/packages/dotlrn-news/tcl/dotlrn-news-procs.tcl	2 Jan 2016 21:58:25 -0000	1.33.2.2
@@ -136,7 +136,11 @@
         set interval_id [notification::get_interval_id -name instant]
         set delivery_method_id [notification::get_delivery_method_id -name email]
 	set community_package_id [dotlrn_community::get_package_id $community_id]
-	set news_package_id [db_string "getnewspackageid" "select package_id from apm_packages where package_key ='news' and package_id in (select object_id from acs_objects where context_id = :community_package_id)"]
+	set news_package_id [db_string getnewspackageid {
+            select package_id from apm_packages
+            where package_key ='news'
+            and package_id in (select object_id from acs_objects where context_id = :community_package_id)
+        }]
 
         notification::request::new \
                 -type_id $type_id \
@@ -162,7 +166,11 @@
         remove_portlet $portal_id $args
 
 	set community_package_id [dotlrn_community::get_package_id $community_id]
-	set news_package_id [db_string "getnewspackageid" "select package_id from apm_packages where package_key ='news' and package_id in (select object_id from acs_objects where context_id = :community_package_id)"]
+	set news_package_id [db_string getnewspackageid {
+            select package_id from apm_packages
+            where package_key ='news'
+            and package_id in (select object_id from acs_objects where context_id = :community_package_id)
+        }]
 
         notification::request::delete \
                 -request_id [notification::request::get_request_id \