Changeset 660

Timestamp:

Dec 28, 2004, 5:31:58 PM (19 years ago)

Author:

plg

Message:

• bugs fixed in filesystem synchronization : if no existing category at start, need to initialize $next_rankNULL, $next_id and $next_element_id

• bug fixed : if no queries executed on the page, $count_queries and $queries_time are not initialized for page bottom display

• no use of $confprefix_thumbnail in language information (admin.lang.php)

Location:

trunk

Files:

• admin/update.php (modified) (3 diffs)
• include/page_tail.php (modified) (1 diff)
• language/en_UK.iso-8859-1/admin.lang.php (modified) (1 diff)

trunk/admin/update.php

@@ -116 +116 @@
 
   // finding next rank for each id_uppercat
+  $next_rank['NULL'] = 1;
+  
   $query = '
 SELECT id_uppercat, MAX(rank)+1 AS next_rank
@@ -134 +136 @@
   // next category id available
   $query = '
-SELECT MAX(id)+1 AS next_id
+SELECT IF(MAX(id)+1 IS NULL, 1, MAX(id)+1) AS next_id
   FROM '.CATEGORIES_TABLE.'
 ;';
@@ -297 +299 @@
   // next element id available
   $query = '
-SELECT MAX(id)+1 AS next_element_id
+SELECT IF(MAX(id)+1 IS NULL, 1, MAX(id)+1) AS next_element_id
   FROM '.IMAGES_TABLE.'
 ;';

trunk/include/page_tail.php

@@ -41 +41 @@
 if ($conf['show_gt'])
 {
-  $time = get_elapsed_time( $t2, get_moment() );
+  $time = get_elapsed_time($t2, get_moment());
+
+  if (!isset($count_queries))
+  {
+    $count_queries = 0;
+    $queries_time = 0;
+  }
   
   $template->assign_block_vars(

trunk/language/en_UK.iso-8859-1/admin.lang.php

@@ -266 +266 @@
 $lang['update_missing_tn'] = 'the thumbnail is missing for';
 $lang['update_missing_tn_short'] = 'missing thumbnail';
-$lang['update_missing_tn_info'] = 'a picture filetype requires a thumbnail. The thumbnail must be present in the sub-directory "thumbnail" of the category directory. The thumbnail filename must start with "'.$conf['prefix_thumbnail'].'" and the extension must be among the following list :';
+$lang['update_missing_tn_info'] = 'a picture filetype requires a thumbnail. The thumbnail must be present in the sub-directory "thumbnail" of the category directory. The thumbnail filename must start with the configured thumbnail prefix and the extension must be among the following list :';
 $lang['update_disappeared_tn'] = 'the thumbnail disapeared';
 $lang['update_disappeared'] = 'doesn\'t exist';