From: <sy...@us...> - 2010-02-07 21:25:08
|
Revision: 24925 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=24925&view=rev Author: sylvieg Date: 2010-02-07 21:24:44 +0000 (Sun, 07 Feb 2010) Log Message: ----------- [FIX]tracker: fix the link for star/rating: trackerlist can be on other than a wiki page Modified Paths: -------------- trunk/lib/wiki-plugins/wikiplugin_trackerlist.php trunk/templates/tracker_item_field_value.tpl Modified: trunk/lib/wiki-plugins/wikiplugin_trackerlist.php =================================================================== --- trunk/lib/wiki-plugins/wikiplugin_trackerlist.php 2010-02-07 20:24:50 UTC (rev 24924) +++ trunk/lib/wiki-plugins/wikiplugin_trackerlist.php 2010-02-07 21:24:44 UTC (rev 24925) @@ -329,7 +329,7 @@ } } if ($hasVoted) { - $url = preg_replace('/vote=y&?/', '', preg_replace('/itemId=[0-9]+&?/', '', preg_replace('/ins_[0-9]+=-?[0-9]*&?/', '', $_SERVER['REQUEST_URI']))); + $url = preg_replace('/[(\?)|&]vote=y/', '$1', preg_replace('/[(\?)|&]itemId=[0-9]+/', '$1', preg_replace('/[(\?)|&]ins_[0-9]+=-?[0-9]*/', '$1', $_SERVER['REQUEST_URI']))); header("Location: $url"); die; } Modified: trunk/templates/tracker_item_field_value.tpl =================================================================== --- trunk/templates/tracker_item_field_value.tpl 2010-02-07 20:24:50 UTC (rev 24924) +++ trunk/templates/tracker_item_field_value.tpl 2010-02-07 21:24:44 UTC (rev 24925) @@ -318,7 +318,7 @@ {if ($tiki_p_tracker_vote_ratings eq 'y' && (!isset($field_value.my_rate) || $field_value.my_rate === false)) || ($tiki_p_tracker_revote_ratings eq 'y' && isset($field_value.my_rate) && $field_value.my_rate !== false)} {capture name=thisvote}{tr}Click to vote for this value:{/tr} {$field_value.options_array[i]}{/capture} - <a href="{$smarty.server.PHP_SELF}?trackerId={$item.trackerId}&itemId={$item.itemId}&ins_{$field_value.fieldId}={$field_value.options_array[i]}&vote=y{if $page}&page={$page|escape:url}{/if}"> + <a href="{$smarty.server.REQUEST_URI}{if empty($smarty.server.QUERY_STRING)}?{else}&{/if}itemId={$item.itemId}&ins_{$field_value.fieldId}={$field_value.options_array[i]}&vote=y"> {/if} {if $field_value.voteavg >= $field_value.options_array[i]} {icon _id='star' alt=$field_value.options_array[i] title=$smarty.capture.thisvote} @@ -340,7 +340,7 @@ {icon _id='help' title=$smarty.capture.stat} {/if} {if $tiki_p_tracker_revote_ratings eq 'y' and isset($field_value.my_rate) and in_array($field_value.my_rate, $field_value.options_array)} - <a href="{$smarty.server.PHP_SELF}{if $query_string}?{$query_string}{else}?{/if}trackerId={$item.trackerId}&itemId={$item.itemId}&ins_{$field_value.fieldId}=NULL&vote=y{if $page}&page={$page|escape:url}{/if}" title="{tr}Clik to delete your vote{/tr}">x</a> + <a href="{$smarty.server.REQUEST_URI}{if empty($smarty.server.QUERY_STRING)}?{else}&{/if}itemId={$item.itemId}&ins_{$field_value.fieldId}=NULL&vote=y" title="{tr}Clik to delete your vote{/tr}">x</a> {/if} <span> {/if} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |