iarv/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-05-05 21:12:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Fix PHP-7.4 Issue "

Browse Source 
This reverts commit ea25f5b3a4.
This commit is contained in:
plegall
2020-03-25 14:55:06 +01:00
parent d3879b19f9
commit 8a5a2d9831
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/functions_category.inc.php
View File

@@ -103,8 +103,6 @@ WHERE '.$where.'
$result = pwg_query($query); $result = pwg_query($query);
$cats = array(); $cats = array();
$selected_category = isset($page['category']) ? $page['category'] : null; $selected_category = isset($page['category']) ? $page['category'] : null;
$selected_category_id = isset($selected_category['id']) ? $selected_category['id'] : null;
$selected_category_id_uppercat = isset($selected_category['id_uppercat']) ? $selected_category['id_uppercat'] : null;
while ($row = pwg_db_fetch_assoc($result)) while ($row = pwg_db_fetch_assoc($result))
{ {
$child_date_last = @$row['max_date_last']> @$row['date_last']; $child_date_last = @$row['max_date_last']> @$row['date_last'];
@@ -124,8 +122,8 @@ WHERE '.$where.'
), ),
'URL' => make_index_url(array('category' => $row)), 'URL' => make_index_url(array('category' => $row)),
'LEVEL' => substr_count($row['global_rank'], '.') + 1, 'LEVEL' => substr_count($row['global_rank'], '.') + 1,
'SELECTED' => $selected_category_id == $row['id'] ? true : false, 'SELECTED' => $selected_category['id'] == $row['id'] ? true : false,
'IS_UPPERCAT' => $selected_category_id_uppercat == $row['id'] ? true : false, 'IS_UPPERCAT' => $selected_category['id_uppercat'] == $row['id'] ? true : false,
) )
); );
if ($conf['index_new_icon']) if ($conf['index_new_icon'])
@@ -604,4 +602,4 @@ function remove_computed_category(&$cats, $cat)
unset($cats[$cat['cat_id']]); unset($cats[$cat['cat_id']]);
} }
?> ?>