Changeset 12763 for trunk/admin/include/functions.php

Timestamp:

Dec 18, 2011, 12:05:19 AM (13 years ago)

Author:

plg

Message:

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).

File:

• trunk/admin/include/functions.php (modified) (2 diffs)

trunk/admin/include/functions.php

@@ -1220 +1220 @@
   $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 +1291 @@
 ;';
   pwg_query($query);
+
+  update_global_rank();
 
   if ('private' == $insert['status'])