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

Timestamp:

Jun 9, 2010, 10:25:03 PM (14 years ago)

Author:

nikrou

Message:

Fix bug 1722 : PosgtreSQL wants all fields in select to be in Group by clause
or agregate function
Fix issue for lambda function (incorrect number of params)

File:

• trunk/include/functions_user.inc.php (modified) (2 diffs)

trunk/include/functions_user.inc.php

@@ -291 +291 @@
   $row = pwg_db_fetch_assoc(pwg_query($query));
 
-  // retrieve additional user data
+  // retrieve user info
   $query = '
 SELECT
-    COUNT(1) AS counter,
     ui.*,
     uc.*,
@@ -301 +300 @@
     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);
+
+  // retrieve additional user data ?
+  if ($conf['external_authentification'])
+  {
+    $query = '
+SELECT
+    COUNT(1) AS counter,
+  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.'
   GROUP BY ui.user_id
 ;';
-  $result = pwg_query($query);
-  $user_infos_row = pwg_db_fetch_assoc($result);
-  if (!isset($user_infos_row['counter']) or 0 == $user_infos_row['counter']) {
-    create_user_infos($user_id);
+    if (pwg_db_fetch_row(pwg_query($query))!=1)
+    {
+      create_user_infos($user_id);
     
-    $result = pwg_query($query);
-    $user_infos_row = pwg_db_fetch_assoc($result);
+      $result = pwg_query($user_info_query);
+      $user_infos_row = pwg_db_fetch_assoc($result);      
+    }
   }