[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[26393] branches/5.x/lib/wiki-plugins/ wikiplugin_trackerfilter.php

[<jon...@us...>]

Revision: 26393
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=26393&view=rev
Author:   jonnybradley
Date:     2010-03-31 12:42:17 +0000 (Wed, 31 Mar 2010)

Log Message:
-----------
[FIX] Search and set selected on input correctly with urlencoded values

Modified Paths:
--------------
    branches/5.x/lib/wiki-plugins/wikiplugin_trackerfilter.php

Modified: branches/5.x/lib/wiki-plugins/wikiplugin_trackerfilter.php
===================================================================
--- branches/5.x/lib/wiki-plugins/wikiplugin_trackerfilter.php	2010-03-31 10:54:06 UTC (rev 26392)
+++ branches/5.x/lib/wiki-plugins/wikiplugin_trackerfilter.php	2010-03-31 12:42:17 UTC (rev 26393)
@@ -113,6 +113,7 @@
 		}
 		foreach ($_REQUEST as $key =>$val) {
 			if (substr($key, 0, 2) == 'f_' && !empty($val) && (!is_array($val) || !empty($val[0]))) {
+				$val = urldecode($val);
 				$fieldId = substr($key, 2);
 				if (!is_numeric($fieldId)) { // composite filter
 					$ffs[] = array('sqlsearch'=>explode(':', str_replace(array('(', ')'), '', $fieldId)));
@@ -358,7 +359,7 @@
 					if ($field['type'] == 'y') { // country
 						$opt['name'] = str_replace('_', ' ', $opt['name']);
 					}
-					if (!empty($_REQUEST['f_'.$fieldId]) && ((!is_array($_REQUEST['f_'.$fieldId]) && $_REQUEST['f_'.$fieldId] == $val) || (is_array($_REQUEST['f_'.$fieldId]) && in_array($val, $_REQUEST['f_'.$fieldId])))) {
+					if (!empty($_REQUEST['f_'.$fieldId]) && ((!is_array($_REQUEST['f_'.$fieldId]) && urldecode($_REQUEST['f_'.$fieldId]) == $val) || (is_array($_REQUEST['f_'.$fieldId]) && in_array($val, $_REQUEST['f_'.$fieldId])))) {
 						$opt['selected'] = 'y';
 						$selected = true;
 					} else {


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