Changeset 6322

Timestamp:

May 24, 2010, 1:14:54 PM (15 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)
• about.php (modified) (1 prop)
• action.php (modified) (1 prop)
• admin.php (modified) (1 prop)
• category.php (modified) (1 prop)
• comments.php (modified) (1 prop)
• feed.php (modified) (1 prop)
• identification.php (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) (1 diff, 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)
• index.php (modified) (1 prop)
• install.php (modified) (1 prop)
• nbm.php (modified) (1 prop)
• notification.php (modified) (1 prop)
• password.php (modified) (1 prop)
• picture.php (modified) (1 prop)
• popuphelp.php (modified) (1 prop)
• profile.php (modified) (1 prop)
• qsearch.php (modified) (1 prop)
• random.php (modified) (1 prop)
• register.php (modified) (1 prop)
• search.php (modified) (1 prop)
• search_rules.php (modified) (1 prop)
• tags.php (modified) (1 prop)
• upgrade.php (modified) (1 prop)
• upgrade_feed.php (modified) (1 prop)
• upload.php (modified) (1 prop)
• ws.php (modified) (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);