Index: openacs-4/packages/fs-portlet/www/fs-admin-portlet.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/fs-portlet/www/fs-admin-portlet.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/fs-portlet/www/fs-admin-portlet.tcl 24 Feb 2005 13:33:20 -0000 1.4 +++ openacs-4/packages/fs-portlet/www/fs-admin-portlet.tcl 29 Sep 2013 13:54:10 -0000 1.5 @@ -39,5 +39,5 @@ ad_return_template set package_id [site_node_apm_integration::get_child_package_id -package_key "file-storage"] -set fs_url "/shared/parameters?[export_url_vars package_id return_url]" +set fs_url "/shared/parameters?[export_vars -url {package_id return_url}]" set show_fs_url_p [parameter::get_from_package_key -parameter ShowParametersLinkP -package_key [fs_portlet::my_package_key] -default 1] Index: openacs-4/packages/news-portlet/www/summary.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news-portlet/www/summary.tcl,v diff -u -r1.8 -r1.9 --- openacs-4/packages/news-portlet/www/summary.tcl 29 Dec 2009 01:05:14 -0000 1.8 +++ openacs-4/packages/news-portlet/www/summary.tcl 29 Sep 2013 13:54:10 -0000 1.9 @@ -21,7 +21,7 @@ comment_link:onevalue } -ad_require_permission [ad_conn package_id] news_read +permission::require_permission -object_id [ad_conn package_id] -privilege news_read # live view of a news item in its active revision @@ -43,8 +43,8 @@ if { $item_exist_p } { #currently not using comments in the summary but someone might want to change the template so they are available. - if { [ad_parameter SolicitCommentsP "news" 0] && - [ad_permission_p $item_id general_comments_create] } { + if { [parameter::get -parameter SolicitCommentsP -default 0] && + [permission::permission_p -object_id $item_id -privilege general_comments_create] } { set comment_link [general_comments_create_link $item_id "[ad_conn package_url]item?item_id=$item_id"] set comments [general_comments_get_comments -print_content_p 1 -print_attachments_p 1 \ $item_id "[ad_conn package_url]item?item_id=$item_id"]