From: <sy...@us...> - 2008-10-07 17:24:42
|
Revision: 15033 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=15033&view=rev Author: sylvieg Date: 2008-10-07 17:24:40 +0000 (Tue, 07 Oct 2008) Log Message: ----------- [FIX]wiki: to be able to have [link|~~#ff0000:description~~] as it is possible for (()) Modified Paths: -------------- trunk/lib/tikilib.php Modified: trunk/lib/tikilib.php =================================================================== --- trunk/lib/tikilib.php 2008-10-07 17:12:31 UTC (rev 15032) +++ trunk/lib/tikilib.php 2008-10-07 17:24:40 UTC (rev 15033) @@ -5962,6 +5962,11 @@ // Extract [link] sections (to be re-inserted later) $noparsedlinks = array(); + if (!$simple_wiki) { + // Replace colors ~~foreground[,background]:text~~ + // must be done before []as the description may contain color change + $data = preg_replace("/\~\~([^\:\,]+)(,([^\:]+))?:([^\~]+)\~\~/", "<span style=\"color:$1; background:$3\">$4</span>", $data); + } // This section matches [...]. // Added handling for [[foo] sections. -rlpowell if (!$simple_wiki) { @@ -6047,8 +6052,6 @@ if (!$simple_wiki) { // Replace boxes $data = preg_replace("/\^([^\^]+)\^/", "<div class=\"simplebox\">$1</div>", $data); - // Replace colors ~~foreground[,background]:text~~ - $data = preg_replace("/\~\~([^\:\,]+)(,([^\:]+))?:([^\~]+)\~\~/", "<span style=\"color:$1; background:$3\">$4</span>", $data); // Underlined text $data = preg_replace("/===(.+?)===/", "<span style=\"text-decoration:underline;\">$1</span>", $data); // Center text This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |