iarv/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-03-28 17:42:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

PHP 7.4 fixes

Browse Source
This commit is contained in:
Rasmus Lerdorf
2020-01-27 15:03:50 -08:00
committed by Pierrick Le Gall
parent 8a5a2d9831
commit f9edbd34f7
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/functions_category.inc.php
View File

@@ -122,8 +122,8 @@ WHERE '.$where.'
),
'URL' => make_index_url(array('category' => $row)),
'LEVEL' => substr_count($row['global_rank'], '.') + 1,
'SELECTED' => $selected_category['id'] == $row['id'] ? true : false,
'IS_UPPERCAT' => $selected_category['id_uppercat'] == $row['id'] ? true : false,
'SELECTED' => ($selected_category!==null && $selected_category['id'] == $row['id']) ? true : false,
'IS_UPPERCAT' => ($selected_category!==null && $selected_category['id_uppercat'] == $row['id']) ? true : false,
)
);
if ($conf['index_new_icon'])
@@ -602,4 +602,4 @@ function remove_computed_category(&$cats, $cat)
unset($cats[$cat['cat_id']]);
}
?>
?>

4
include/smarty/libs/sysplugins/smarty_internal_runtime_updatescope.php
View File

@@ -47,7 +47,9 @@ class Smarty_Internal_Runtime_UpdateScope
while (isset($ptr->parent)) {
$ptr = $ptr->parent;
}
$ptr->tpl_vars[$varName] = $tpl->tpl_vars[$varName];
if ($ptr) {
$ptr->tpl_vars[$varName] = $tpl->tpl_vars[$varName];
}
}
}
}