Changeset 6322 for trunk/include/functions_user.inc.php

Timestamp:

May 24, 2010, 1:14:54 PM (14 years ago)

Author:

plg

Message:

merge r6321 from branch 2.1 to trunk

bug 1682: r6312 was producing a MySQL error (depending on the MySQL server
version) because a count() implies a group by.

This code change was checked against MySQL 5.0.75, MySQL 5.0.51 (where the
error occured) and SQLite 3.6.22.

Location:

trunk

Files:

• . (modified) (1 prop)
• include (modified) (1 prop)
• include/functions_user.inc.php (modified) (1 diff, 1 prop)

trunk/include/functions_user.inc.php

@@ -302 +302 @@
     LEFT JOIN '.THEMES_TABLE.' AS t ON t.id = ui.theme
   WHERE ui.user_id = \''.$user_id.'\'
+  GROUP BY ui.user_id
 ;';
   $result = pwg_query($query);
   $user_infos_row = pwg_db_fetch_assoc($result);
-  if (0 == $user_infos_row['counter']) {
+  if (!isset($user_infos_row['counter']) or 0 == $user_infos_row['counter']) {
     create_user_infos($user_id);