Index: openacs-4/www/blank-master.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/www/blank-master.tcl,v diff -u -N -r1.52 -r1.53 --- openacs-4/www/blank-master.tcl 17 Oct 2010 21:06:09 -0000 1.52 +++ openacs-4/www/blank-master.tcl 27 Oct 2014 16:42:09 -0000 1.53 @@ -59,7 +59,7 @@ $Id$ } -if {[template::util::is_nil doc(type)]} { +if {![info exists doc(type)]} { set doc(type) {} } @@ -98,7 +98,7 @@ foreach param $css { lappend params -[lindex $param 0] [lindex $param 1] } - eval [concat template::head::add_css $params] + template::head::add_css {*}$params } } @@ -180,7 +180,7 @@ set lang_list [list [lang::user::language] [lang::system::language]] set tinymce_lang "en" foreach elm $lang_list { - if { [file exists [acs_root_dir]/${tinymce_relpath}/langs/${elm}.js] } { + if { [file exists $::acs::rootdir/${tinymce_relpath}/langs/${elm}.js] } { set tinymce_lang $elm break } @@ -199,7 +199,7 @@ # AG: Markup in tags doesn't render well. set doc(title) [ns_striphtml $doc(title)] -if {[template::util::is_nil doc(charset)]} { +if {![info exists doc(charset)]} { set doc(charset) [ns_config ns/parameters OutputCharset [ad_conn charset]] } @@ -222,11 +222,7 @@ # Determine if developer support is installed and enabled # -set developer_support_p [expr { - [llength [info procs ::ds_show_p]] == 1 && [ds_show_p] -}] - -if {$developer_support_p} { +if {[llength [info commands ::ds_show_p]] == 1 && [ds_show_p]} { template::head::add_css \ -href "/resources/acs-developer-support/acs-developer-support.css" \ -media "all" @@ -242,7 +238,6 @@ -event onload \ -script "acs_Focus('${form_name}', '${element_name}');" \ -identifier "focus" - } }