Changeset 5014
- Timestamp:
- Mar 1, 2010, 5:22:34 PM (14 years ago)
- Location:
- trunk
- Files:
-
- 70 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
/branches/2.0/include/config_default.inc.php merged: 5013
r4985 r5014 760 760 // or other plugin variables etc 761 761 $conf['local_data_dir'] = dirname(dirname(__FILE__)).'/_data'; 762 763 // where should the API add photos? 764 $conf['upload_dir'] = PHPWG_ROOT_PATH.'upload'; 762 765 ?> - Property svn:mergeinfo changed
-
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 (with no actual effect on merging)
-
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/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
/branches/2.0/include/ws_functions.inc.php merged: 5013
r4966 r5014 912 912 function ws_images_add_chunk($params, &$service) 913 913 { 914 global $conf; 915 914 916 ws_logfile('[ws_images_add_chunk] welcome'); 915 917 // data … … 942 944 } 943 945 944 $upload_dir = PHPWG_ROOT_PATH.'upload/buffer';946 $upload_dir = $conf['upload_dir'].'/buffer'; 945 947 946 948 // create the upload directory tree if not exists … … 991 993 function merge_chunks($output_filepath, $original_sum, $type) 992 994 { 995 global $conf; 996 993 997 ws_logfile('[merge_chunks] input parameter $output_filepath : '.$output_filepath); 994 998 … … 1004 1008 } 1005 1009 1006 $upload_dir = PHPWG_ROOT_PATH.'upload/buffer';1010 $upload_dir = $conf['upload_dir'].'/buffer'; 1007 1011 $pattern = '/'.$original_sum.'-'.$type.'/'; 1008 1012 $chunks = array(); … … 1231 1235 // upload directory hierarchy 1232 1236 $upload_dir = sprintf( 1233 PHPWG_ROOT_PATH.'upload/%s/%s/%s',1237 $conf['upload_dir'].'/%s/%s/%s', 1234 1238 $year, 1235 1239 $month, - Property svn:mergeinfo changed
-
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.