From: <jon...@us...> - 2010-03-30 17:52:32
|
Revision: 26389 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=26389&view=rev Author: jonnybradley Date: 2010-03-30 17:52:25 +0000 (Tue, 30 Mar 2010) Log Message: ----------- [FIX] More on trackerfilter fields with wiki syntax in. Only striptags from the option label (name), but url encode the value for the form. Still doesn't find the items as it should, but doesn't completely break the html select etc as it did before. Modified Paths: -------------- branches/5.x/lib/wiki-plugins/wikiplugin_trackerfilter.php branches/5.x/templates/wiki-plugins/wikiplugin_trackerfilter.tpl Modified: branches/5.x/lib/wiki-plugins/wikiplugin_trackerfilter.php =================================================================== --- branches/5.x/lib/wiki-plugins/wikiplugin_trackerfilter.php 2010-03-30 17:47:16 UTC (rev 26388) +++ branches/5.x/lib/wiki-plugins/wikiplugin_trackerfilter.php 2010-03-30 17:52:25 UTC (rev 26389) @@ -297,12 +297,12 @@ case '*': // stars $cumul = ''; foreach ($field['options_array'] as $val) { - $val = strip_tags($tikilib->parse_data($val)); + $sval = strip_tags($tikilib->parse_data($val)); $opt['id'] = $val; if ($field['type'] == '*') { $cumul = $opt['name'] = "$cumul*"; } else { - $opt['name'] = $val; + $opt['name'] = $sval; } 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])))) { $opt['selected'] = 'y'; @@ -352,9 +352,9 @@ $res = $trklib->list_tracker_field_values($trackerId, $fieldId); } foreach ($res as $val) { - $val = strip_tags($tikilib->parse_data($val)); + $sval = strip_tags($tikilib->parse_data($val)); $opt['id'] = $val; - $opt['name'] = $val; + $opt['name'] = $sval; if ($field['type'] == 'y') { // country $opt['name'] = str_replace('_', ' ', $opt['name']); } Modified: branches/5.x/templates/wiki-plugins/wikiplugin_trackerfilter.tpl =================================================================== --- branches/5.x/templates/wiki-plugins/wikiplugin_trackerfilter.tpl 2010-03-30 17:47:16 UTC (rev 26388) +++ branches/5.x/templates/wiki-plugins/wikiplugin_trackerfilter.tpl 2010-03-30 17:52:25 UTC (rev 26389) @@ -23,8 +23,8 @@ <select id="f_{$filters[if].fieldId}" name="f_{$filters[if].fieldId}{if $filters[if].format eq "m"}[]{/if}" {if $filters[if].format eq "m"} size="5" multiple="multiple"{/if}> <option value=""{if !$filters[if].selected} selected="selected"{/if}>{tr}Any{/tr}</option> {section name=io loop=$filters[if].opts} - <option value="{$filters[if].opts[io].id|escape}"{if $filters[if].opts[io].selected eq "y"} selected="selected"{/if}> - {$filters[if].opts[io].name|tr_if} + <option value="{$filters[if].opts[io].id|escape:url}"{if $filters[if].opts[io].selected eq "y"} selected="selected"{/if}> + {$filters[if].opts[io].name|tr_if|escape} </option> {/section} </select> @@ -62,7 +62,7 @@ {section name=io loop=$filters[if].opts} <input {if $filters[if].format eq "c"}type="checkbox"{else}type="radio"{/if} name="f_{$filters[if].fieldId}{if $filters[if].format eq "c"}[]{/if}" - value="{$filters[if].opts[io].id|escape}" + value="{$filters[if].opts[io].id|escape:url}" {if $filters[if].opts[io].selected eq "y"} checked="checked"{/if} /> {$filters[if].opts[io].name|tr_if} {if $line ne 'y'}<br />{/if} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |