[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[14020] branches/2.0/lib/tikilib.php

[<lu...@us...>]

Revision: 14020
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=14020&view=rev
Author:   luciash
Date:     2008-08-01 22:47:03 +0000 (Fri, 01 Aug 2008)

Log Message:
-----------
[FIX] respect nocache parameter at second position too (as before adding rel for shadowbox)

Modified Paths:
--------------
    branches/2.0/lib/tikilib.php

Modified: branches/2.0/lib/tikilib.php
===================================================================
--- branches/2.0/lib/tikilib.php	2008-08-01 22:44:16 UTC (rev 14019)
+++ branches/2.0/lib/tikilib.php	2008-08-01 22:47:03 UTC (rev 14020)
@@ -6167,19 +6167,25 @@
 			//$link2 = str_replace("?","\?",$link2);
 			//$link2 = str_replace("&","\&",$link2);
 			$link2 = str_replace("/", "\/", preg_quote($link));
-			$pattern = "/(?<!\[)\[$link2\|([^\]\|]+)\|([^\]\|]+)\|([^\]]+)\]/"; //< last param here is nocache
-			$data = preg_replace($pattern, "<a $class $rel $target href=\"$link\" rel=\"$2 $rel\">$1</a>$ext_icon", $data);
-			$pattern = "/(?<!\[)\[$link2\|([^\]\|]+)\|([^\]]+)\]/";//< last param here ($2) is for relation (rel) attribute (e.g. shadowbox)
-			$data = preg_replace($pattern, "<a $class $rel $target href=\"$link\" rel=\"$2 $rel\">$1</a>$ext_icon $cosa", $data);
+			$pattern = "/(?<!\[)\[$link2\|([^\]\|]+)\|([^\]\|]+)\|([^\]]+)\]/"; //< last param expected here is always nocache
+			$data = preg_replace($pattern, "<a $class $target href=\"$link\" rel=\"$2 $rel\">$1</a>$ext_icon", $data);
+			$pattern = "/(?<!\[)\[$link2\|([^\]\|]+)\|([^\]]+)\]/";//< last param here ($2) is used for relation (rel) attribute (e.g. shadowbox) or nocache
+			preg_match($pattern, $data, &$matches);
+			if ($matches[2]=='nocache') {
+				$data = preg_replace($pattern, "<a $class $target href=\"$link\" rel=\"$rel\">$1</a>$ext_icon", $data);
+			} else {
+				$data = preg_replace($pattern, "<a $class $target href=\"$link\" rel=\"$2 $rel\">$1</a>$ext_icon $cosa", $data);
+			}
 			$pattern = "/(?<!\[)\[$link2\|([^\]\|]+)\]/";
-			$data = preg_replace($pattern, "<a $class $rel $target href=\"$link\" rel=\"$rel\">$1</a>$ext_icon $cosa", $data);
+			$data = preg_replace($pattern, "<a $class $target href=\"$link\" rel=\"$rel\">$1</a>$ext_icon $cosa", $data);
 			$pattern = "/(?<!\[)\[$link2\]/";
-			$data = preg_replace($pattern, "<a $class $rel $target href=\"$link\" rel=\"$rel\">$link</a>$ext_icon $cosa", $data);
+			$data = preg_replace($pattern, "<a $class $target href=\"$link\" rel=\"$rel\">$link</a>$ext_icon $cosa", $data);
 	    } else {
 			//$link2 = str_replace("/","\/",$link);
 			//$link2 = str_replace("?","\?",$link2);
 			//$link2 = str_replace("&","\&",$link2);
 			$link2 = str_replace("/", "\/", preg_quote($link));
+			$data = str_replace("|nocache", "", $data);
 
 			$pattern = "/(?<!\[)\[$link2\|([^\]\|]+)\|([^\]]+)\]/";
 			$data = preg_replace($pattern, "<a $class $target href=\"$link\" rel=\"$2 $rel\">$1</a>$ext_icon", $data);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.