From 953dada953c3617e3ddd3071de8a0679bfea7cb9 Mon Sep 17 00:00:00 2001
From: plegall <plg@piwigo.org>
Date: Sun, 23 Oct 2005 21:43:26 +0000
Subject: - 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
---
 admin/update.php | 14 +++++++++++++-
 doc/ChangeLog    |  4 ++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/admin/update.php b/admin/update.php
index e4283a824..93e4f300f 100644
--- a/admin/update.php
+++ b/admin/update.php
@@ -116,9 +116,21 @@ 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.'
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 354d4a99f..7485e8793 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,4 +1,8 @@
+2005-10-23 Pierrick LE GALL
 
+	* bug fixed: during file tree synchronization, warning on finding
+	the next rank of category which has no sub-categories yet.
+	
 2005-10-23 chrisaga
 
 	* bug fixed: cat-list.tpl validate now
-- 
cgit v1.2.3