OpenACS

gustafn
committed
oacs-5-9:gustafn:20170210120205
on 10 Feb 17
- don't store hkeys for xowiki::FormPage in the cache
- bump version of xowiki to 0.156
openacs-4/.../xowiki/tcl/package-procs.tcl (+2 -2)
993 993       return ""
994 994     }
995 995
996 996     #my log "--o object is '$object'"
997 997     if {$object eq ""} {
998 998       #
999 999       # We have no object, but as well no method callable on the
1000 1000       # package If the method is "view", allow it to be called on the
1001 1001       # root folder object.
1002 1002       set m [my query_parameter m]
1003 1003       if {$m in {list show-object file-upload}} {
1004 1004         my instvar folder_id
1005 1005         array set "" [list \
1006 1006                           name [$folder_id name] \
1007 1007                           stripped_name [$folder_id name] \
1008 1008                           parent_id [$folder_id parent_id] \
1009 1009                           item_id $folder_id \
1010 1010                           method [my query_parameter m]]
1011 1011       } else {
1012 1012         set object [$id get_parameter index_page "index"]
1013           my log "--o object after getting index_page is '$object'"
  1013         #my log "--o object after getting index_page is '$object'"
1014 1014       }
1015 1015     }
1016 1016
1017 1017     #
1018 1018     # second, resolve object level, unless we got a value already
1019 1019     #
1020 1020     if {![info exists (item_id)]} {
1021 1021       array set "" [my item_info_from_url -with_package_prefix false -default_lang $lang $object]
1022 1022       #my log "item_info_from_url returns [array get {}]"
1023 1023     }
1024 1024
1025 1025     if {$(item_id) ne 0} {
1026 1026       if {$(method) ne ""} { set method $(method) }
1027 1027       set page [my get_page_from_item_or_revision_id $(item_id)]
1028 1028
1029 1029       if {[info exists (logical_package_id)] && [info exists (logical_parent_id)]} {
1030 1030         #
1031 1031         # If there was a logical_package_id provided from
1032 1032         # item_info_from_url, we require that also a logical_parent_id
1033 1033         # is required. In this case, change the context of the