Index: openacs-4/tcl/0-acs-init.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/tcl/0-acs-init.tcl,v
diff -u -N -r1.6.10.3 -r1.6.10.4
--- openacs-4/tcl/0-acs-init.tcl	26 Oct 2013 08:48:21 -0000	1.6.10.3
+++ openacs-4/tcl/0-acs-init.tcl	11 Feb 2014 14:49:52 -0000	1.6.10.4
@@ -8,10 +8,12 @@
 # $Id$
 
 # handling NaviServer deprecated ns_info subcommands. 
-namespace eval acs {}
-set ::acs::pageroot [expr {[catch {ns_server pagedir}] ? [ns_info pageroot] : [ns_server pagedir]}]
-set ::acs::tcllib [expr {[catch {ns_server tcllib}] ? [ns_info tcllib] : [ns_server tcllib]}]
-set ::acs::rootdir [file dirname [string trimright $::acs::tcllib "/"]]
+namespace eval acs {
+    set ::acs::pageroot [expr {[catch {ns_server pagedir}] ? [ns_info pageroot] : [ns_server pagedir]}]
+    set ::acs::tcllib [expr {[catch {ns_server tcllib}] ? [ns_info tcllib] : [ns_server tcllib]}]
+    set ::acs::rootdir [file dirname [string trimright $::acs::tcllib "/"]]
+    #if {[info commands ::dbi_foreach] ne ""} { set ::acs::preferdbi 1 }
+}
 
 # Determine the OpenACS root directory, which is the directory right above the
 # Tcl library directory ::acs::tcllib.
@@ -20,12 +22,13 @@
 
 ns_log "Notice" "Loading OpenACS, rooted at $::acs::rootdir"
 set bootstrap_file "$::acs::rootdir/packages/acs-bootstrap-installer/bootstrap.tcl"
-ns_log "Notice" "Sourcing $bootstrap_file"
 
 if { [file isfile $bootstrap_file] } {
 
-    # Check that the appropriate version of tDom (http://www.tdom.org) is installed
-    # and spit out a comment or try to install it if not.
+    #
+    # Check that the appropriate version of tDom (http://www.tdom.org)
+    # is installed and spit out a comment or try to install it if not.
+    #
     if {[info commands domNode] eq ""} { 
 	if {[ns_info version] < 4} {
 	    ns_log Error "0-acs-init.tcl: domNode command not found -- libtdom.so not loaded?"
@@ -41,7 +44,8 @@
 	    }
 	}
     }
-        
+
+    ns_log "Notice" "Sourcing $bootstrap_file"        
     source $bootstrap_file
 } else {
     ns_log "Error" "$bootstrap_file does not exist. Aborting the OpenACS load process."