Index: openacs-4/packages/xowiki/tcl/package-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/package-procs.tcl,v diff -u -r1.291.2.22 -r1.291.2.23 --- openacs-4/packages/xowiki/tcl/package-procs.tcl 27 May 2016 08:26:30 -0000 1.291.2.22 +++ openacs-4/packages/xowiki/tcl/package-procs.tcl 1 Jun 2016 10:41:36 -0000 1.291.2.23 @@ -147,6 +147,13 @@ return [string range [my default_locale] 0 1] } + Package instproc validate_tag {tag} { + if {![regexp {^[\w-]+$} $tag]} { + ad_return_complaint 1 "invalid tag" + ad_script_abort + } + } + Package array set www-file { admin 1 diff 1 @@ -1570,11 +1577,7 @@ if {$(lang) eq "tag"} { # todo: missing: tag links to subdirectories, also on url generation set tag $stripped_url - if {![regexp {^[\w.,: -]+$} $tag]} { - ad_return_complaint 1 "invalid tag" - ad_script_abort - } - + :validate_tag $tag set summary [::xo::cc query_parameter summary 0] set popular [::xo::cc query_parameter popular 0] if {$summary eq ""} {set summary 0}