[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[43848] branches/10.x/lib

[<nk...@us...>]

Revision: 43848
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=43848&view=rev
Author:   nkoth
Date:     2012-11-09 00:17:06 +0000 (Fri, 09 Nov 2012)
Log Message:
-----------
[FIX] Array key was getting messed up causing recalllastsearch feature to break inconsistently as it depends on it for fieldid

Modified Paths:
--------------
    branches/10.x/lib/core/WikiParser/PluginMatcher.php
    branches/10.x/lib/wiki-plugins/wikiplugin_customsearch.php

Modified: branches/10.x/lib/core/WikiParser/PluginMatcher.php
===================================================================
--- branches/10.x/lib/core/WikiParser/PluginMatcher.php	2012-11-08 23:35:40 UTC (rev 43847)
+++ branches/10.x/lib/core/WikiParser/PluginMatcher.php	2012-11-09 00:17:06 UTC (rev 43848)
@@ -320,12 +320,14 @@
 	private $matcher = false;
 	private $start = false;
 	private $end = false;
+	private $initialstart = false;
 	private $arguments = false;
 
 	function __construct($matcher, $start)
 	{
 		$this->matcher = $matcher;
 		$this->start = $start;
+		$this->initialstart = $start;
 	}
 
 	function findName($limit)
@@ -480,6 +482,11 @@
 		return $this->end;
 	}
 
+	function getInitialStart()
+	{
+		return $this->initialstart;
+	}
+
 	function getBodyStart()
 	{
 		return $this->bodyStart;

Modified: branches/10.x/lib/wiki-plugins/wikiplugin_customsearch.php
===================================================================
--- branches/10.x/lib/wiki-plugins/wikiplugin_customsearch.php	2012-11-08 23:35:40 UTC (rev 43847)
+++ branches/10.x/lib/wiki-plugins/wikiplugin_customsearch.php	2012-11-09 00:17:06 UTC (rev 43848)
@@ -178,10 +178,11 @@
 });
 ";
 
-	foreach ($matches as $k => $match) {
+	foreach ($matches as $match) {
 		$name = $match->getName();
 		$arguments = $parser->parse($match->getArguments());
-		$fieldid = "customsearch_{$id}_$k";
+		$key = $match->getInitialStart();
+		$fieldid = "customsearch_{$id}_$key";
 		if ($name == 'sort' && !empty($arguments['mode']) && empty($sort_mode)) {
 			$sort_mode = $arguments['mode'];
 			$match->replaceWith('');

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