Index: openacs-4/packages/acs-templating/tcl/paginator-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/paginator-procs.tcl,v diff -u -r1.24 -r1.25 --- openacs-4/packages/acs-templating/tcl/paginator-procs.tcl 18 Nov 2015 08:22:51 -0000 1.24 +++ openacs-4/packages/acs-templating/tcl/paginator-procs.tcl 7 Aug 2017 23:48:02 -0000 1.25 @@ -1,14 +1,18 @@ -# Query paginator for the ArsDigita Templating System +ad_library { + Query paginator for the ArsDigita Templating System -# Copyright (C) 1999-2000 ArsDigita Corporation -# Authors: Karl Goldstein (karlg@arsdigita.com) + @author Karl Goldstein (karlg@arsdigita.com) -# $Id$ + @cvs-id $Id$ +} +# Copyright (C) 1999-2000 ArsDigita Corporation + # This is free software distributed under the terms of the GNU Public # License. Full text of the license is available from the GNU Project: # http://www.fsf.org/copyleft/gpl.html + namespace eval template {} namespace eval template::paginator {} @@ -114,7 +118,8 @@ # problem. # if { ($row_ids eq {} && ![::cache exists $cache_key]) - || ([info exists opts(flush_p)] && $opts(flush_p) == "t") } { + || ([info exists opts(flush_p)] && $opts(flush_p) == "t") + } { if { [info exists opts(printing_prefs)] && $opts(printing_prefs) ne "" } { set title [lindex $opts(printing_prefs) 0] set stylesheet [lindex $opts(printing_prefs) 1] @@ -152,15 +157,13 @@ } set return_url [lindex $opts(printing_prefs) 5] if { $return_url ne "" } { - # Not sure, what the intented semantics of this command was... + # Not sure, what the intended semantics of this command was... #if { [llength $opts(row_ids)]==0 } { # nsv_set __template_cache_timeout $cache_key $opts(timeout) #} ns_write [subst { - }] @@ -208,7 +211,8 @@ if {$original_query eq ""} { # ...which was slightly modified to keep the original query untampered. set list_name [lindex [split $name ,] 0] - if {![catch {template::list::get_reference -name $list_name}]} { + if {[info exists ::[template::list::get_refname -name $list_name]]} { + template::list::get_reference -name $list_name set original_query $list_properties(page_query_original) } } @@ -641,7 +645,7 @@