Index: openacs-4/packages/acs-developer-support/lib/toolbar.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-developer-support/lib/toolbar.tcl,v
diff -u -r1.17 -r1.17.2.1
--- openacs-4/packages/acs-developer-support/lib/toolbar.tcl	7 Apr 2018 08:52:03 -0000	1.17
+++ openacs-4/packages/acs-developer-support/lib/toolbar.tcl	5 Mar 2019 14:51:34 -0000	1.17.2.1
@@ -14,37 +14,37 @@
     # multirow append ds_buttons COM \
         "Display comments inline" \
         [export_vars -base "${ds_url}comments-toggle" { { return_url [ad_return_url]} }] \
-        [ad_decode [ds_comments_p]  1 "on" "off"]
+        [expr {[ds_comments_p] ? "on" : "off"}]
 
     multirow append ds_buttons USR \
         "Toggle user switching" \
         [export_vars -base "${ds_url}set" { {field user} {enabled_p {[expr {![ds_user_switching_enabled_p]}]}} {return_url [ad_return_url]} }] \
-        [ad_decode [ds_user_switching_enabled_p] 1 "on" "off"]
+        [expr {[ds_user_switching_enabled_p] ? "on" : "off"}]
 
     multirow append ds_buttons DB \
         "Toggle DB data collection" \
         [export_vars -base "${ds_url}set" { {field db} {enabled_p {[expr {![ds_database_enabled_p]}]}} {return_url [ad_return_url]} }] \
-        [ad_decode [ds_database_enabled_p] 1 "on" "off"]
+        [expr {[ds_database_enabled_p] ? "on" : "off"}]
 
     multirow append ds_buttons PRO \
         "Toggle template profiling" \
         [export_vars -base "${ds_url}set" { {field prof} {enabled_p {[expr {![ds_profiling_enabled_p]}]}} {return_url [ad_return_url]} }] \
-        [ad_decode [ds_profiling_enabled_p] 1 "on" "off"]
+        [expr {[ds_profiling_enabled_p] ? "on" : "off"}]
 
     multirow append ds_buttons FRG \
         "Toggle caching page fragments" \
         [export_vars -base "${ds_url}set" { {field frag} {enabled_p {[expr {![ds_page_fragment_cache_enabled_p]}]}} {return_url [ad_return_url]} }] \
-        [ad_decode [ds_page_fragment_cache_enabled_p] 1 "on" "off"]
+        [expr {[ds_page_fragment_cache_enabled_p] ? "on" : "off"}]
 
     multirow append ds_buttons TRN \
         "Toggle translation mode" \
         [export_vars -base "/acs-lang/admin/translator-mode-toggle" { { return_url [ad_return_url]}}] \
-        [ad_decode [lang::util::translator_mode_p] 1 "on" "off"]
+        [expr {[lang::util::translator_mode_p] ? "on" : "off"}]
 
     multirow append ds_buttons ADP \
         "Toggle ADP reveal" \
         \# \
-        [ad_decode [ds_adp_reveal_enabled_p] 1 "on" "off"]
+        [expr {[ds_adp_reveal_enabled_p] ? "on" : "off"}]
 
     template::add_body_script -script {
         document.getElementById('ACS_DS_ADP').addEventListener('click', function (event) {