- remove square/thumb from choices on picture
- fix content margin on password register - purge derivative cache by type of derivative - session saved infos/messages are not given to the page on html redirections - shorter/faster code in functions_xxx git-svn-id: http://piwigo.org/svn/trunk@13074 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
parent
40280db9d8
commit
f6825cfb33
11 changed files with 94 additions and 113 deletions
|
|
@ -485,33 +485,5 @@ SELECT image_id
|
|||
return $image_id;
|
||||
}
|
||||
|
||||
/**
|
||||
* create a tree from a flat list of categories, no recursivity for high speed
|
||||
*/
|
||||
function categories_flatlist_to_tree($categories)
|
||||
{
|
||||
$tree = array();
|
||||
$key_of_cat = array();
|
||||
|
||||
foreach ($categories as $key => &$node)
|
||||
{
|
||||
$key_of_cat[$node['id']] = $key;
|
||||
|
||||
if (!isset($node['id_uppercat']))
|
||||
{
|
||||
$tree[$key] = &$node;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (!isset($categories[ $key_of_cat[ $node['id_uppercat'] ] ]['sub_categories']))
|
||||
{
|
||||
$categories[ $key_of_cat[ $node['id_uppercat'] ] ]['sub_categories'] = array();
|
||||
}
|
||||
|
||||
$categories[ $key_of_cat[ $node['id_uppercat'] ] ]['sub_categories'][$key] = &$node;
|
||||
}
|
||||
}
|
||||
|
||||
return $tree;
|
||||
}
|
||||
?>
|
||||
Loading…
Add table
Add a link
Reference in a new issue