Changeset 6314
- Timestamp:
- May 24, 2010, 1:42:03 AM (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 (added) merged: 6311
r6090 r6314 797 797 unset($cache['default_user']['status']); 798 798 unset($cache['default_user']['registration_date']); 799 800 // theme and language fields may be null in the database (see 801 // bug:1683) This is absolutely not nice to have this code in this 802 // very place, but it avoids a complexe upgrade with an "automatic 803 // fix" in the database => this code should be removed after branch 804 // 2.1 if a migration tasks performs the job the same way 805 if (empty($cache['default_user']['theme'])) 806 { 807 mass_updates( 808 USER_INFOS_TABLE, 809 array( 810 'primary' => array('user_id'), 811 'update' => array('theme') 812 ), 813 array( 814 array( 815 'user_id' => $conf['default_user_id'], 816 'theme' => PHPWG_DEFAULT_TEMPLATE 817 ) 818 ) 819 ); 820 $cache['default_user']['theme'] = PHPWG_DEFAULT_TEMPLATE; 821 } 822 823 if (empty($cache['default_user']['language'])) 824 { 825 mass_updates( 826 USER_INFOS_TABLE, 827 array( 828 'primary' => array('user_id'), 829 'update' => array('language') 830 ), 831 array( 832 array( 833 'user_id' => $conf['default_user_id'], 834 'language' => PHPWG_DEFAULT_LANGUAGE 835 ) 836 ) 837 ); 838 $cache['default_user']['language'] = PHPWG_DEFAULT_LANGUAGE; 839 } 799 840 } 800 841 } - 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
set to
/branches/2.1/include/no_photo_yet.inc.php merged eligible
-
Property
svn:mergeinfo
set to
-
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
/branches/2.1/profile.php (added) merged: 6311
r5996 r6314 106 106 $_POST['language'] 107 107 ); 108 $_POST['theme'] = get_default_theme(); 109 $_POST['language'] = get_default_language(); 108 110 } 109 111 - Property svn:mergeinfo changed
-
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.