Commit fbfd7e35 authored by Jonny Bradley's avatar Jonny Bradley

[FIX] menus: Remove the url encoding from old menu tpls as ./ (the default...

[FIX] menus: Remove the url encoding from old menu tpls as ./ (the default home link) gets messed up, suppose it's not really a proper URL? Default html encoding seems ok though as it was before r56957 (thanks Geoff)
parent 38b8f118
......@@ -46,7 +46,7 @@
<li class="dropdown option{$chdata.optionId} menuSection menuSection{$opensec} menuLevel{$opensec}{if isset($chdata.selected) and $chdata.selected} selected{/if}{if isset($chdata.selectedAscendant) and $chdata.selectedAscendant} selectedAscendant{/if}">
{if empty($chdata.block)}
<a{if !empty($chdata.url)} href="{if $prefs.feature_sefurl eq 'y' and $chdata.sefurl}{$chdata.sefurl|escape:'url'}{else}{$chdata.url|escape:'url'}{/if}"{/if}>
<a{if !empty($chdata.url)} href="{if $prefs.feature_sefurl eq 'y' and $chdata.sefurl}{$chdata.sefurl|escape}{else}{$chdata.url|escape}{/if}"{/if}>
{if $menu_type eq 'vert' and $prefs.menus_items_icons eq 'y' and $menu_info.use_items_icons eq 'y' and $opensec eq 0}
{icon _id=$chdata.icon alt='' _defaultdir=$prefs.menus_items_icons_path}
{elseif isset($icon) and $icon}
......@@ -66,7 +66,7 @@
{elseif $chdata.type eq 'o'}
<li class="option{$chdata.optionId} menuOption menuLevel{$opensec}{if isset($chdata.selected) and $chdata.selected} selected{/if}{if isset($chdata.selectedAscendant) and $chdata.selectedAscendant} selectedAscendant{/if}">
{if empty($chdata.block)}
<a href="{if $prefs.feature_sefurl eq 'y' and $chdata.sefurl}{$chdata.sefurl|escape:'url'}{else}{$chdata.url|escape:'url'}{/if}">
<a href="{if $prefs.feature_sefurl eq 'y' and $chdata.sefurl}{$chdata.sefurl|escape}{else}{$chdata.url|escape}{/if}">
{if $menu_type eq 'vert' and $prefs.menus_items_icons eq 'y' and $menu_info.use_items_icons eq 'y' and $opensec eq 0}
{icon _id=$chdata.icon alt='' _defaultdir=$prefs.menus_items_icons_path}
{/if}
......
......@@ -49,7 +49,7 @@
</span>
{if $chdata.url and $link_on_section eq 'y'}
<span class="separatoricon-url" style="display:none">
<a href="{if $prefs.feature_sefurl eq 'y' and !empty($chdata.sefurl)}{$chdata.sefurl|escape:'url'}{else}{$chdata.url|escape:'url'}{/if}">
<a href="{if $prefs.feature_sefurl eq 'y' and !empty($chdata.sefurl)}{$chdata.sefurl|escape}{else}{$chdata.url|escape}{/if}">
{icon _id=$chdata.icon alt="{tr}Toggle{/tr}" _defaultdir=$prefs.menus_items_icons_path}
</a>
</span>
......@@ -66,7 +66,7 @@
{/if}
{/if}
{if $chdata.url and $link_on_section eq 'y'}
<a href="{if $prefs.feature_sefurl eq 'y' and !empty($chdata.sefurl)}{$chdata.sefurl|escape:'url'}{else}{$chdata.url|escape:'url'}{/if}" class="separator">
<a href="{if $prefs.feature_sefurl eq 'y' and !empty($chdata.sefurl)}{$chdata.sefurl|escape}{else}{$chdata.url|escape}{/if}" class="separator">
{else}
<a href="#" onclick="icontoggle('menu{$cname}', this); return false;" class="separator" id="sep{$cname}">
{/if}
......@@ -85,7 +85,7 @@
{* ----------------------------- option *}
{elseif $chdata.type eq 'o'}
<div class="option{$chdata.optionId} option{$sep}{if isset($chdata.selected) and $chdata.selected} selected{/if}">
<a href="{if $prefs.feature_sefurl eq 'y' and !empty($chdata.sefurl)}{$chdata.sefurl|escape:'url'}{else}{$chdata.url|escape:'url'}{/if}" class="linkmenu">
<a href="{if $prefs.feature_sefurl eq 'y' and !empty($chdata.sefurl)}{$chdata.sefurl|escape}{else}{$chdata.url|escape}{/if}" class="linkmenu">
{if $prefs.menus_items_icons eq 'y' and $menu_info.use_items_icons eq 'y' and ($opensec eq 0 or $chdata.icon neq '')}
{icon _id=$chdata.icon alt='' _defaultdir=$prefs.menus_items_icons_path}
{/if}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment