archive/piwigo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge r12762 from branch 2.3 to trunk

Browse source 
bug 2536 fixed: a new virtual album is now added on top of the list of other
albums in the parent album (instead of bottom).



git-svn-id: http://piwigo.org/svn/trunk@12763 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
plegall 2011-12-17 23:05:19 +00:00
parent b581ba81b7
commit f500499530
1 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
admin/include/functions.php
View file

@ -1219,16 +1219,9 @@ function create_virtual_category($category_name, $parent_id=null)
$parent_id = !empty($parent_id) ? $parent_id : 'NULL';
$query = '
SELECT MAX(rank)
FROM '.CATEGORIES_TABLE.'
WHERE id_uppercat '.(is_numeric($parent_id) ? '= '.$parent_id : 'IS NULL').'
;';
list($current_rank) = pwg_db_fetch_row(pwg_query($query));
$insert = array(
'name' => $category_name,
'rank' => ++$current_rank,
'rank' => 0,
'commentable' => boolean_to_string($conf['newcat_default_commentable']),
);
@ -1298,6 +1291,8 @@ UPDATE
;';
pwg_query($query);
update_global_rank();
if ('private' == $insert['status'])
{
add_permission_on_category($inserted_id, array_unique(array_merge(get_admins(), array($user['id']))));