Index: openacs-4/packages/static-pages/tcl/static-pages-sc-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/static-pages/tcl/static-pages-sc-procs.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/static-pages/tcl/static-pages-sc-procs.tcl 25 Mar 2004 12:07:21 -0000 1.4 +++ openacs-4/packages/static-pages/tcl/static-pages-sc-procs.tcl 19 Apr 2018 08:00:46 -0000 1.5 @@ -13,14 +13,14 @@ Right now I am leaving the keywords blank in the future we should either extract them from the META keyword tag or allow assignment of cr_keywords to static_pages - + @author Dave Bauer (dave@thedesignexperience.org) @param object_id the object_id for which to generate the data } { set path_stub [cr_fs_path STATIC_PAGES] - + db_0or1row sp_datasource "" -column_array datasource return [array get datasource] @@ -33,14 +33,14 @@ } { db_1row sp_url "" - if {[string match /www/* $url]} { + if {[string match /www/* $url]} { # strip the /www off since its in pageroot return [ad_url][string range $url 4 end] } else { # find a package to match the url - if {[regexp {/packages/([^/]*)/www/(.*)} $url match key stub]} { + if {[regexp {/packages/([^/]*)/www/(.*)} $url match key stub]} { set base [lindex [site_node::get_children -element url -package_key $key -node_id [site_node::get_element -url / -element node_id]] 0] - if {![empty_string_p $base]} { + if {$base ne ""} { return "[ad_url]$base$stub" } }