merge r12762 from branch 2.3 to trunk

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
Piwigo · Dec 17, 2011 · f500499 · f500499
1 parent b581ba8
commit f500499
Showing 1 changed file with 3 additions and 8 deletions.
diff --git a/admin/include/functions.php b/admin/include/functions.php
@@ -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 @@ function create_virtual_category($category_name, $parent_id=null)
 ;';
   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']))));