From: Jonny B. <jo...@ti...> - 2010-02-04 14:49:23
|
Also needs a reference to the commit in trunk. +1 for rollback On 4 Feb 2010, at 12:17, Sylvie Greverend wrote: > 1/ please do not commit directly in 4.x > 2/ I do not understand thsi one. What is the interedt to go in a apge > that does not have the text you are looking for > Thanks > sylvie > > On Thu, 2010-02-04 at 01:07 +0000, ri...@us... wrote: >> Revision: 24829 >> http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=24829&view=rev >> Author: ricks99 >> Date: 2010-02-04 01:07:51 +0000 (Thu, 04 Feb 2010) >> >> Log Message: >> ----------- >> [FIX]Bug #1552. Tiki will now append the &bl parameter to search results (wiki pages only) when the multilingual and best_languages features are enabled. >> >> Modified Paths: >> -------------- >> branches/4.x/templates/tiki-searchindex.tpl >> branches/4.x/templates/tiki-searchresults.tpl >> >> Modified: branches/4.x/templates/tiki-searchindex.tpl >> =================================================================== >> --- branches/4.x/templates/tiki-searchindex.tpl 2010-02-03 23:21:10 UTC (rev 24828) >> +++ branches/4.x/templates/tiki-searchindex.tpl 2010-02-04 01:07:51 UTC (rev 24829) >> @@ -84,7 +84,7 @@ >> {if $prefs.feature_search_show_object_type eq 'y'} >> <span class="objecttype">{tr}{$results[search].location}{/tr}:</span> >> {/if} >> - <a href="{$results[search].href}&highlight={$words}{$results[search].anchor}" class="objectname">{$results[search].pageName|strip_tags|escape}</a> >> + <a href="{$results[search].href}&highlight={$words}{$results[search].anchor}{if $results[search].location eq 'Wiki'}{if ($prefs.feature_multilingual eq 'y') and ($prefs.feature_best_language eq 'y')}&bl{/if}{/if}" class="objectname">{$results[search].pageName|strip_tags|escape}</a> >> {if $prefs.feature_search_show_visit_count eq 'y'} >> <span class="itemhits">({tr}Hits{/tr}: {$results[search].hits})</span> >> {/if} >> >> Modified: branches/4.x/templates/tiki-searchresults.tpl >> =================================================================== >> --- branches/4.x/templates/tiki-searchresults.tpl 2010-02-03 23:21:10 UTC (rev 24828) >> +++ branches/4.x/templates/tiki-searchresults.tpl 2010-02-04 01:07:51 UTC (rev 24829) >> @@ -139,7 +139,7 @@ >> {if !empty($results[search].parentName)} >> <a href="{$results[search].parentHref}" class="parentname">{$results[search].parentName|escape}</a> >> {/if} >> - <a href="{$results[search].href}&highlight={$words}" class="objectname">{$results[search].pageName|strip_tags}</a> >> + <a href="{$results[search].href}&highlight={$words}{if $results[search].type eq 'Wiki'}{if ($prefs.feature_multilingual eq 'y') and ($prefs.feature_best_language eq 'y')}&bl{/if}{/if}" class="objectname">{$results[search].pageName|strip_tags}</a> >> {if $prefs.feature_search_show_visit_count eq 'y'} >> <span class="itemhits">({tr}Hits{/tr}: {$results[search].hits})</span> >> {/if} >> >> >> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. >> >> ------------------------------------------------------------------------------ >> The Planet: dedicated and managed hosting, cloud storage, colocation >> Stay online with enterprise data centers and the best network in the business >> Choose flexible plans and management services without long-term contracts >> Personal 24x7 support from experience hosting pros just a phone call away. >> http://p.sf.net/sfu/theplanet-com >> _______________________________________________ >> Tikiwiki-cvs mailing list >> Tik...@li... >> https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs > > > > ------------------------------------------------------------------------------ > The Planet: dedicated and managed hosting, cloud storage, colocation > Stay online with enterprise data centers and the best network in the business > Choose flexible plans and management services without long-term contracts > Personal 24x7 support from experience hosting pros just a phone call away. > http://p.sf.net/sfu/theplanet-com > _______________________________________________ > Tikiwiki-cvs mailing list > Tik...@li... > https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs |