Item13277: somehow these got reverted. Probably my fault

foswiki · Feb 25, 2015 · 13de588 · 13de588
1 parent 7519c12
commit 13de588
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/FamFamFamContrib/templates/view.famfamfam.tmpl b/FamFamFamContrib/templates/view.famfamfam.tmpl
@@ -10,9 +10,9 @@
 	</a></span>%TMPL:END%
 
 %TMPL:DEF{"top:toolbarbutton_subscribe"}%<span>
-    %SUBSCRIBE{format="<a href='$url' class='subscribe_link' data-subscribe='{validation_key:"%NONCE%"}' rel='nofollow' title='%MAKETEXT{"Subscribe to this topic (s)"}%'>
+    %SUBSCRIBE{format="<a href='$url' class='subscribe_link' data-subscribe='%JSON_DATA%' rel='nofollow' title='%MAKETEXT{"Subscribe to this topic (s)"}%'>
         <img alt='%MAKETEXT{"Subscribe to this topic (s)"}%' src='%PUBURL%/%SYSTEMWEB%/DocumentGraphics/notify.png' width='16' height='16' />
-    </a>" formatunsubscribe="<a href='$url' class='subscribe_link' data-subscribe='{validation_key:"%NONCE%"}' rel='nofollow' title='%MAKETEXT{"Unsubscribe from this topic (s)"}%'>
+    </a>" formatunsubscribe="<a href='$url' class='subscribe_link' data-subscribe='%JSON_DATA%' rel='nofollow' title='%MAKETEXT{"Unsubscribe from this topic (s)"}%'>
         <img alt='%MAKETEXT{"Unsubscribe from this topic (s)"}%' src='%PUBURL%/%SYSTEMWEB%/DocumentGraphics/notify.png' width='16' height='16' />
     </a>"}%</span>%TMPL:END%
 

diff --git a/core/templates/viewtopicactionbuttons.tmpl b/core/templates/viewtopicactionbuttons.tmpl
@@ -14,7 +14,7 @@
 
 %TMPL:DEF{"attach_link"}%<a class='foswikiRequiresChangePermission' href='%SCRIPTURLPATH{"attach"}%/%BASEWEB%/%BASETOPIC%' rel='nofollow' %IF{"context footer_text" then="%MAKETEXT{"title='Attach an image or document to this topic' accesskey='a'>&Attach"}%" else="%MAKETEXT{"title='Attach an image or document to this topic'>Attach"}%" }%</a>%TMPL:END%
 
-%TMPL:DEF{"subscribe_link"}%<span>%SUBSCRIBE{format="<a href='$url' class='subscribe_link' data-subscribe='{\"validation_key\":\"%NONCE%\"}' rel='nofollow' %MAKETEXT{"title='Subscribe to this topic' accesskey='s'>&Subscribe"}%</a>" formatunsubscribe="<a href='$url' class='subscribe_link' data-subscribe='$restparams' rel='nofollow' %MAKETEXT{"title='Unsubscribe from this topic' accesskey='s'>Un&subscribe"}%</a>"}%</span>%TMPL:END%
+%TMPL:DEF{"subscribe_link"}%<span>%SUBSCRIBE{format="<a href='$url' class='subscribe_link' data-subscribe='%JSON_DATA%' rel='nofollow' %MAKETEXT{"title='Subscribe to this topic' accesskey='s'>&Subscribe"}%</a>" formatunsubscribe="<a href='$url' class='subscribe_link' data-subscribe='%JSON_DATA%' rel='nofollow' %MAKETEXT{"title='Unsubscribe from this topic' accesskey='s'>Un&subscribe"}%</a>"}%</span>%TMPL:END%
 
 %TMPL:DEF{"more_link"}%<span><a href='%SCRIPTURLPATH{"view"}%/%BASEWEB%/%BASETOPIC%?template=more&maxrev=%MAXREV%&currrev=%CURRREV%' rel='nofollow' %MAKETEXT{"title='Delete or rename this topic; set parent topic; view and compare revisions' accesskey='m'>&More topic actions"}%</a></span>%TMPL:END%