Changeset 12763


Ignore:
Timestamp:
12/18/11 00:05:19 (8 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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/admin/include/functions.php

    r12642 r12763  
    12201220  $parent_id = !empty($parent_id) ? $parent_id : 'NULL'; 
    12211221 
    1222   $query = ' 
    1223 SELECT MAX(rank) 
    1224   FROM '.CATEGORIES_TABLE.' 
    1225   WHERE id_uppercat '.(is_numeric($parent_id) ? '= '.$parent_id : 'IS NULL').' 
    1226 ;'; 
    1227   list($current_rank) = pwg_db_fetch_row(pwg_query($query)); 
    1228  
    12291222  $insert = array( 
    12301223    'name' => $category_name, 
    1231     'rank' => ++$current_rank, 
     1224    'rank' => 0, 
    12321225    'commentable' => boolean_to_string($conf['newcat_default_commentable']), 
    12331226    ); 
     
    12981291;'; 
    12991292  pwg_query($query); 
     1293 
     1294  update_global_rank(); 
    13001295 
    13011296  if ('private' == $insert['status']) 
Note: See TracChangeset for help on using the changeset viewer.