From: <ch...@us...> - 2011-11-07 19:30:40
|
Revision: 38742 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=38742&view=rev Author: chealer Date: 2011-11-07 19:30:33 +0000 (Mon, 07 Nov 2011) Log Message: ----------- [bp/r38740][FIX] Broken links from self_link (and button) with double-HTML-encoded ampersands when a script links to itself Revision Links: -------------- http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=38740&view=rev Modified Paths: -------------- branches/proposals/6.x/lib/smarty_tiki/block.ajax_href.php Modified: branches/proposals/6.x/lib/smarty_tiki/block.ajax_href.php =================================================================== --- branches/proposals/6.x/lib/smarty_tiki/block.ajax_href.php 2011-11-07 19:15:41 UTC (rev 38741) +++ branches/proposals/6.x/lib/smarty_tiki/block.ajax_href.php 2011-11-07 19:30:33 UTC (rev 38742) @@ -50,7 +50,7 @@ // temporary switch to not do ajax for ckeditor button - not reliable in tiki 6 // Actually in tiki 6 even when not ckeditor if you edit while in tiki-index vs editpage the plugin help breaks as well, you get blank help if ( $prefs['ajax_xajax'] !== 'y' || $prefs['javascript_enabled'] == 'n' || $template === 'tiki-editpage.tpl' ) { - return " href=\"" . htmlspecialchars($url, ENT_QUOTES) . "\" "; + return " href=\"" . $url . "\" "; } else { $max_tikitabs = 50; // Same value as in header.tpl, <body> tag onload's param if (empty($params['_anchor'])) { @@ -58,6 +58,6 @@ } else { $anchor = '#'.$params['_anchor']; } - return " href=\"$anchor\" onclick=\"$onclick $func('" . htmlspecialchars($url, ENT_QUOTES) . "','$template','$htmlelement',$max_tikitabs,'$last_user'); return false\" "; + return " href=\"$anchor\" onclick=\"$onclick $func('" . $url . "','$template','$htmlelement',$max_tikitabs,'$last_user'); return false\" "; } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |