From 0c8cebe04422aa47021f66acfcd2e3629ccaf7ae Mon Sep 17 00:00:00 2001 From: plegall Date: Mon, 3 May 2010 12:49:26 +0000 Subject: bug 1639 fixed: the upload form now correctly uses the $conf['upload_dir'] parameter (web API already use it). By default, the $conf['upload_dir'] is no longer dependent to PHPWG_ROOT_PATH because it becomes a real mess when admin/include/uploadify.php (called directly, not from an include) tries to perform an upload. Improvement: make clearer how $conf['upload_dir'] can be set (relative to the Piwigo installation directory + HTTP reachable) git-svn-id: http://piwigo.org/svn/trunk@6052 68402e56-0260-453c-a942-63ccdbb3a9ee --- include/config_default.inc.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'include/config_default.inc.php') diff --git a/include/config_default.inc.php b/include/config_default.inc.php index 78d5fea54..b833f0bb5 100644 --- a/include/config_default.inc.php +++ b/include/config_default.inc.php @@ -761,8 +761,10 @@ $conf['light_slideshow'] = true; // or other plugin variables etc $conf['local_data_dir'] = dirname(dirname(__FILE__)).'/_data'; -// where should the API add photos? -$conf['upload_dir'] = PHPWG_ROOT_PATH.'upload'; +// where should the API/UploadForm add photos? This path must be relative to +// the Piwigo installation directory (but can be outside, as long as it's +// reachable from your webserver). +$conf['upload_dir'] = './upload'; // where should the user be guided when there is no photo in his gallery yet? $conf['no_photo_yet_url'] = 'admin.php?page=photos_add'; -- cgit v1.2.3