Changeset 6315 for trunk/include

Timestamp:

May 24, 2010, 1:43:43 AM (14 years ago)

Author:

plg

Message:

merge r6312 from branch 2.1 to trunk

bug 1684 fixed: the test to check availability of the user_infos line was
wrong. I had changed the old db_num_rows > 0 because it was not working with
SQLite. As suggested by nicolas, let's use a simpler trick "count(1)" in the
query itself, this way it should work with any database engine.

I've also removed the while (true) (ugly infinite loop, with a condition for
exit) that was producing an infinite loop for Piwigo installations with 2.0
database model and 2.1 code (before launching upgrade.php)

Location:

trunk

Files:

• . (modified) (1 prop)
• include (modified) (1 prop)
• include/block.class.php (modified) (1 prop)
• include/calendar_base.class.php (modified) (1 prop)
• include/calendar_monthly.class.php (modified) (1 prop)
• include/calendar_weekly.class.php (modified) (1 prop)
• include/category_cats.inc.php (modified) (1 prop)
• include/category_default.inc.php (modified) (1 prop)
• include/class_smtp_mail.inc.php (modified) (1 prop)
• include/common.inc.php (modified) (1 prop)
• include/config_default.inc.php (modified) (1 prop)
• include/constants.php (modified) (1 prop)
• include/feedcreator.class.php (modified) (1 prop)
• include/filter.inc.php (modified) (1 prop)
• include/functions.inc.php (modified) (1 prop)
• include/functions_calendar.inc.php (modified) (1 prop)
• include/functions_category.inc.php (modified) (1 prop)
• include/functions_comment.inc.php (modified) (1 prop)
• include/functions_cookie.inc.php (modified) (1 prop)
• include/functions_filter.inc.php (modified) (1 prop)
• include/functions_html.inc.php (modified) (1 prop)
• include/functions_mail.inc.php (modified) (1 prop)
• include/functions_metadata.inc.php (modified) (1 prop)
• include/functions_notification.inc.php (modified) (1 prop)
• include/functions_picture.inc.php (modified) (1 prop)
• include/functions_plugins.inc.php (modified) (1 prop)
• include/functions_rate.inc.php (modified) (1 prop)
• include/functions_search.inc.php (modified) (1 prop)
• include/functions_session.inc.php (modified) (1 prop)
• include/functions_tag.inc.php (modified) (1 prop)
• include/functions_url.inc.php (modified) (1 prop)
• include/functions_user.inc.php (modified) (2 diffs, 1 prop)
• include/functions_xml.inc.php (modified) (1 prop)
• include/index.php (modified) (1 prop)
• include/menubar.inc.php (modified) (1 prop)
• include/no_photo_yet.inc.php (modified) (1 prop)
• include/page_header.php (modified) (1 prop)
• include/page_tail.php (modified) (1 prop)
• include/picture_comment.inc.php (modified) (1 prop)
• include/picture_metadata.inc.php (modified) (1 prop)
• include/picture_rate.inc.php (modified) (1 prop)
• include/section_init.inc.php (modified) (1 prop)
• include/template.class.php (modified) (1 prop)
• include/user.inc.php (modified) (1 prop)
• include/ws_core.inc.php (modified) (1 prop)
• include/ws_functions.inc.php (modified) (1 prop)

trunk/include/functions_user.inc.php

@@ -268 +268 @@
   $userdata = array();
 
+  // retrieve basic user data
   $query = '
 SELECT ';
@@ -290 +291 @@
   $row = pwg_db_fetch_assoc(pwg_query($query));
 
-  while (true)
-  {
-    $query = '
-SELECT ui.*, uc.*, t.name AS theme_name
+  // retrieve additional user data
+  $query = '
+SELECT
+    COUNT(1) AS counter,
+    ui.*,
+    uc.*,
+    t.name AS theme_name
   FROM '.USER_INFOS_TABLE.' AS ui
     LEFT JOIN '.USER_CACHE_TABLE.' AS uc ON ui.user_id = uc.user_id
     LEFT JOIN '.THEMES_TABLE.' AS t ON t.id = ui.theme
-  WHERE ui.user_id = \''.$user_id.'\'';
+  WHERE ui.user_id = \''.$user_id.'\'
+;';
+  $result = pwg_query($query);
+  $user_infos_row = pwg_db_fetch_assoc($result);
+  if (0 == $user_infos_row['counter']) {
+    create_user_infos($user_id);
+    
     $result = pwg_query($query);
-    if ($result)
-    {
-      break;
-    }
-    else
-    {
-      create_user_infos($user_id);
-    }
-  }
-
-  $row = array_merge($row, pwg_db_fetch_assoc($result));
+    $user_infos_row = pwg_db_fetch_assoc($result);
+  }
+
+  // then merge basic + additional user data
+  $row = array_merge($row, $user_infos_row);
 
   foreach ($row as $key => $value)