Index: openacs-4/tcl/zz-postload.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/tcl/zz-postload.tcl,v diff -u -r1.7.2.1 -r1.7.2.2 --- openacs-4/tcl/zz-postload.tcl 14 Feb 2019 10:02:36 -0000 1.7.2.1 +++ openacs-4/tcl/zz-postload.tcl 15 Sep 2021 16:20:46 -0000 1.7.2.2 @@ -34,7 +34,8 @@ # the subdirectory and it would not be searched. proc __is_xql {arg} { - return [expr {[file isdirectory $arg] || [file extension $arg] eq ".xql"}]} + return [expr {[file isdirectory $arg] || [file extension $arg] eq ".xql"}] +} # We need to load query files for the top-level stuff in www and Tcl # dirs is the list of directories to walk for xql files. Packages .xql Index: openacs-4/www/blank-master.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/www/blank-master.tcl,v diff -u -r1.57.2.2 -r1.57.2.3 --- openacs-4/www/blank-master.tcl 14 Feb 2019 10:12:23 -0000 1.57.2.2 +++ openacs-4/www/blank-master.tcl 15 Sep 2021 16:23:14 -0000 1.57.2.3 @@ -26,7 +26,7 @@ ad_conn -set language Must be used to override the document language if necessary. - To add CSS or JavaScript files to the section of the document you can + To add a CSS or JavaScript files to the section of the document you can call the corresponding template::head::add_* functions within your page. @see template::head::add_css @@ -40,7 +40,7 @@ @see template::head::add_link @see template::head::add_script - JavaScript event handlers, such as onload, an be added to the tag by + JavaScript event handlers, such as onload, can be added to the tag by calling template::add_body_handler within your page. @see template::add_body_handler @@ -62,7 +62,7 @@ } if {![info exists doc(type)]} { - set doc(type) {} + set doc(type) {} } # @@ -87,7 +87,7 @@ # e.g. the blank master is installed before the subsite definitions # for the page_plugin callback. Templates are required to be very # robust. -if {[info commands ::callback::subsite::page_plugin::*] ne ""} { +if {[llength [info commands ::callback::subsite::page_plugin::*]]} { callback subsite::page_plugin } @@ -195,7 +195,7 @@ -content "text/html; charset=$doc(charset)" \ -http_equiv "content-type" # -# The following meta tags are unknown for HTML5, therefore discouraged +# The following meta tags are unknown for HTML5, therefore, discouraged # # template::head::add_meta \ # -content "text/css" \ @@ -213,7 +213,7 @@ # Determine if developer support is installed and enabled # -if {[llength [info commands ::ds_show_p]] == 1 && [ds_show_p]} { +if {[namespace which ::ds_show_p] ne {} && [ds_show_p]} { template::head::add_css \ -href "/resources/acs-developer-support/acs-developer-support.css" \ -media "all" @@ -271,7 +271,7 @@ # blocked out. # if {[parameter::get -parameter CSPEnabledP -package_id [ad_acs_kernel_id] -default 0] - && [info commands ::security::csp::render] ne "" + && [namespace which ::security::csp::render] ne "" } { set csp [::security::csp::render] if {$csp ne ""} {