Index: openacs-4/packages/richtext-ckeditor5/richtext-ckeditor5.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/richtext-ckeditor5/richtext-ckeditor5.info,v diff -u -r1.1 -r1.2 --- openacs-4/packages/richtext-ckeditor5/richtext-ckeditor5.info 5 Dec 2017 15:51:26 -0000 1.1 +++ openacs-4/packages/richtext-ckeditor5/richtext-ckeditor5.info 10 Dec 2017 15:19:46 -0000 1.2 @@ -9,15 +9,15 @@ <implements-subsite-p>f</implements-subsite-p> <inherit-templates-p>f</inherit-templates-p> - <version name="0.1" - url="http://openacs.org/repository/download/apm/richtext-ckeditor5-0.1.apm"> + <version name="0.2" + url="http://openacs.org/repository/download/apm/richtext-ckeditor5-0.2.apm"> <owner url="mailto:neumann@wu-wien.ac.at">Gustaf Neumann</owner> <summary>Richtext editor plugin for integrating CKeditor 5 with the acs-templating richtext widget</summary> <release-date>2017-12-05</release-date> <maturity>0</maturity> - <provides url="richtext-ckeditor5" version="0.1"/> + <provides url="richtext-ckeditor5" version="0.2"/> <requires url="acs-templating" version="5.10.0d2"/> <requires url="acs-tcl" version="5.9.1"/> <requires url="xotcl-core" version="5.9.1"/> Index: openacs-4/packages/richtext-ckeditor5/tcl/ckfinder-init.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/richtext-ckeditor5/tcl/ckfinder-init.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/richtext-ckeditor5/tcl/ckfinder-init.tcl 5 Dec 2017 15:51:26 -0000 1.1 +++ openacs-4/packages/richtext-ckeditor5/tcl/ckfinder-init.tcl 10 Dec 2017 15:19:46 -0000 1.2 @@ -212,13 +212,21 @@ # # View handler # +if {$::tcl_version eq "8.5"} { + # + # In Tcl 8.5, "::try" was not yet a builtin of Tcl + # + package require try +} +ns_log notice "REGISTER url GET $::richtext::ckeditor5::ckfinder_url/view" ns_register_proc GET $::richtext::ckeditor5::ckfinder_url/view { # # View function (for "filebrowser" and "uploadimage" plugins) # + ns_log notice "richtext::ckeditor5::ckfinder_url/view URL: <[ad_conn url]> ::richtext::ckeditor5::ckfinder_url <$::richtext::ckeditor5::ckfinder_url>" set ::template::parse_level [info level] - ad_try { + ::try { # # Use the standard page_contract # @@ -230,7 +238,7 @@ -revision_id $image_id \ -user_id [ad_conn user_id] - } ad_script_abort val { + } trap {AD EXCEPTION ad_script_abort} {result} { # # The page contract has probably failed, no need to raise an # exception.