mirrors/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2025-04-26 19:29:58 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Issue #1625 add array key for dataset

Browse source 
add array keys for body data helpful when selecting via javascript

also separates ids for combined tags and albums
This commit is contained in:
HWFord 2022-04-08 09:14:18 +02:00
parent acbf86a6fa
commit 5a4a669c08
3 changed files with 15 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/common.inc.php
View file

@ -52,6 +52,7 @@ $page = array(
'warnings' => array(),
'messages' => array(),
'body_classes' => array(),
'body_data' => array(),
);
$user = array();
$lang = array();

2
include/page_header.php
View file

@ -50,7 +50,7 @@ $template->assign(
'BODY_CLASSES' => $page['body_classes'],
'BODY_DATA' => json_encode($page['body_classes']),
'BODY_DATA' => json_encode($page['body_data']),
)
);

21
include/section_init.inc.php
View file

@ -649,40 +649,45 @@ if ( 'categories'==$page['section'] and isset($page['category']) and !isset($pag
}
array_push($page['body_classes'], 'section-'.$page['section']);
$page['body_data']['section'] = $page['section'];
if ('categories' == $page['section'] && isset($page['category']))
{
$body_class = 'category-'.$page['category']['id'];
array_push($page['body_classes'], 'category-'.$page['category']['id']);
$page['body_data']['category_id'] = $page['category']['id'];
if (isset($page['combined_categories']))
{
$page['body_data']['combined_category_ids'] = array();
foreach ($page['combined_categories'] as $combined_categories)
{
$body_class .= '-'.$combined_categories['id'];
array_push($page['body_classes'],'category-'.$combined_categories['id']);
array_push($page['body_data']['combined_category_ids'], $combined_categories['id']);
}
}
array_push($page['body_classes'], $body_class);
}
elseif (isset($page['tags']))
{
$body_class = 'tag';
$page['body_data']['tag_ids'] = array();
foreach ($page['tags'] as $tag)
{
$body_class .= '-'.$tag['id'];
array_push($page['body_classes'], 'tag-'.$tag['id']);
array_push($page['body_data']['tag_ids'], $tag['id']);
}
array_push($page['body_classes'], $body_class);
}
elseif (isset($page['search']))
{
array_push($page['body_classes'], 'search-'.$page['search']);
$page['body_data']['search_id'] = $page['search'];
}
if (isset($page['image_id']))
{
array_push($page['body_classes'], 'image-'.$page['image_id']);
$page['body_data']['image_id'] = $page['image_id'];
}
trigger_notify('loc_end_section_init');
?>