Changeset 6322
- Timestamp:
- May 24, 2010, 1:14:54 PM (14 years ago)
- Location:
- trunk
- Files:
-
- 71 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk
- Property svn:mergeinfo changed (with no actual effect on merging)
-
trunk/about.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
trunk/action.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
trunk/admin.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
trunk/category.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
trunk/comments.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
trunk/feed.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
trunk/identification.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
trunk/include
- Property svn:mergeinfo changed (with no actual effect on merging)
-
trunk/include/block.class.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
trunk/include/calendar_base.class.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
trunk/include/calendar_monthly.class.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
trunk/include/calendar_weekly.class.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
trunk/include/category_cats.inc.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
trunk/include/category_default.inc.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
trunk/include/class_smtp_mail.inc.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
trunk/include/common.inc.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
trunk/include/config_default.inc.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
trunk/include/constants.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
trunk/include/feedcreator.class.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
trunk/include/filter.inc.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
trunk/include/functions.inc.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
trunk/include/functions_calendar.inc.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
trunk/include/functions_category.inc.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
trunk/include/functions_comment.inc.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
trunk/include/functions_cookie.inc.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
trunk/include/functions_filter.inc.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
trunk/include/functions_html.inc.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
trunk/include/functions_mail.inc.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
trunk/include/functions_metadata.inc.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
trunk/include/functions_notification.inc.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
trunk/include/functions_picture.inc.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
trunk/include/functions_plugins.inc.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
trunk/include/functions_rate.inc.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
trunk/include/functions_search.inc.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
trunk/include/functions_session.inc.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
trunk/include/functions_tag.inc.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
trunk/include/functions_url.inc.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
trunk/include/functions_user.inc.php
- Property svn:mergeinfo changed
/branches/2.1/include/functions_user.inc.php merged: 6321
r6316 r6322 302 302 LEFT JOIN '.THEMES_TABLE.' AS t ON t.id = ui.theme 303 303 WHERE ui.user_id = \''.$user_id.'\' 304 GROUP BY ui.user_id 304 305 ;'; 305 306 $result = pwg_query($query); 306 307 $user_infos_row = pwg_db_fetch_assoc($result); 307 if ( 0 == $user_infos_row['counter']) {308 if (!isset($user_infos_row['counter']) or 0 == $user_infos_row['counter']) { 308 309 create_user_infos($user_id); 309 310 - Property svn:mergeinfo changed
-
trunk/include/functions_xml.inc.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
trunk/include/index.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
trunk/include/menubar.inc.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
trunk/include/no_photo_yet.inc.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
trunk/include/page_header.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
trunk/include/page_tail.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
trunk/include/picture_comment.inc.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
trunk/include/picture_metadata.inc.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
trunk/include/picture_rate.inc.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
trunk/include/section_init.inc.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
trunk/include/template.class.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
trunk/include/user.inc.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
trunk/include/ws_core.inc.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
trunk/include/ws_functions.inc.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
trunk/index.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
trunk/install.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
trunk/nbm.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
trunk/notification.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
trunk/password.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
trunk/picture.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
trunk/popuphelp.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
trunk/profile.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
trunk/qsearch.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
trunk/random.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
trunk/register.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
trunk/search.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
trunk/search_rules.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
trunk/tags.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
trunk/upgrade.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
trunk/upgrade_feed.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
trunk/upload.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
trunk/ws.php
- Property svn:mergeinfo changed (with no actual effect on merging)
Note: See TracChangeset
for help on using the changeset viewer.