Commit 9e07574d authored by jonnybradley's avatar jonnybradley

[MRG] Automatic merge, branches/16.x 60510 to 60517

parent 3ba0be52
......@@ -123,7 +123,7 @@ class AreasLib extends CategLib
function update_areas()
{
global $prefs;
$this->areas->deleteMultiple(); // empty areas table before rebuilding
$this->areas->deleteMultiple([]); // empty areas table before rebuilding
$areas = array();
$descendants = $this->get_category_descendants($prefs['areas_root']);
if (is_array($descendants)) {
......
......@@ -160,6 +160,9 @@ function smarty_function_trackerfields($params, $smarty)
$trklib->registerSectionFormat('config', 'view', $viewItemPretty, tr('Configured'));
$template = $trklib->getSectionFormatTemplate($sectionFormat, $params['mode']);
// smarty doesn't use tpl: as a resource prefix any more
$template = stripos($template, 'tpl:') === 0 ? substr($template, 4) : $template;
$trklib->unregisterSectionFormat('config');
try {
......
......@@ -144,7 +144,7 @@
{icon name='calendar' _menu_text='y' _menu_icon='y' alt="{tr}Events{/tr}"}
</a>{$liend}
{/if}
{$libeg}<a href="tiki-view_tracker.php?trackerId={$tracker.trackerId}">
{$libeg}<a href="{$tracker.trackerId|sefurl:'tracker'}">
{icon name='view' _menu_text='y' _menu_icon='y' alt="{tr}View{/tr}"}
</a>{$liend}
{if $prefs.feature_group_watches eq 'y' and ( $tiki_p_admin_users eq 'y' or $tiki_p_admin eq 'y' )}
......@@ -184,7 +184,7 @@
data-target="#bootstrap-modal"
onclick="$('[data-toggle=popover]').popover('hide');"
>
{icon name='settings' _menu_text='y' _menu_icon='y' alt="{tr}Edit{/tr}"}
{icon name='settings' _menu_text='y' _menu_icon='y' alt="{tr}Properties{/tr}"}
</a>{$liend}
{$libeg}{permission_link mode=text type=tracker permType=trackers id=$tracker.trackerId}{$liend}
{if $tracker.items > 0}
......
......@@ -717,9 +717,9 @@
{/block}
{sectionelse}
{if !$ts.enabled || ($ts.enabled && $ts.ajax)}
{norecords _colspan=$cntcol _text="No topics found"}
{norecords _colspan=$cntcol _text="{tr}No topics found{/tr}"}
{else}
{norecords _colspan=$cntcol _text="Retrieving topics..."}
{norecords _colspan=$cntcol _text="{tr}Retrieving topics...{/tr}"}
{/if}
{/section}
</tbody>
......
......@@ -12,7 +12,7 @@
{/if}
{if $tiki_p_list_trackers eq 'y'}
<a class="btn btn-default" href="tiki-list_trackers.php">
<a class="btn btn-default" href="{if $prefs.feature_sefurl eq 'y'}trackers{else}tiki-list_trackers.php{/if}">
{icon name="trackers"} {tr}Trackers{/tr}
</a>
{/if}
......
......@@ -146,7 +146,7 @@ if (isset($_REQUEST['status'])) {
$_REQUEST['status'] = 'o';
}
foreach ($status_raw as $let => $sta) {
if ((isset($$sta['perm']) and $$sta['perm'] == 'y') or ($my or $ours)) {
if ((isset($sta['perm']) and $sta['perm'] == 'y') or ($my or $ours)) {
if (in_array($let, $sts)) {
$sta['class'] = 'statuson';
$sta['statuslink'] = str_replace($let, '', implode('', $sts));
......
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