- bug fixed: during file tree synchronization, warning on finding the next

  rank of category which has no sub-categories yet.


git-svn-id: http://piwigo.org/svn/trunk@913 68402e56-0260-453c-a942-63ccdbb3a9ee

1 files changed, 13 insertions, 1 deletions

diff --git a/admin/update.php b/admin/update.php
index e4283a824..93e4f300f 100644
--- a/admin/update.php
+++ b/admin/update.php
@@ -116,10 +116,22 @@ SELECT galleries_url
   // we need to have fulldirs as keys to make efficient comparison
   $db_fulldirs = array_flip($db_fulldirs);
 
-  // finding next rank for each id_uppercat
+  // finding next rank for each id_uppercat. By default, each category id
+  // has 1 for next rank on its sub-categories to create
   $next_rank['NULL'] = 1;
   
   $query = '
+SELECT id
+  FROM '.CATEGORIES_TABLE.'
+;';
+  $result = pwg_query($query);
+  while ($row = mysql_fetch_array($result))
+  {
+    $next_rank[$row['id']] = 1;
+  }
+
+  // let's see if some categories already have some sub-categories...
+  $query = '
 SELECT id_uppercat, MAX(rank)+1 AS next_rank
   FROM '.CATEGORIES_TABLE.'
   GROUP BY id_uppercat