aboutsummaryrefslogtreecommitdiffstats
path: root/include/config_default.inc.php
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2010-03-01 16:22:34 +0000
committerplegall <plg@piwigo.org>2010-03-01 16:22:34 +0000
commit35694a636ef34dba5384e1a530b837208b9e55f9 (patch)
tree908cf4e3a7c02f82293bb78ace9155e6db360d59 /include/config_default.inc.php
parent91a6b6a7363248b613bdb19fd310c5dc2a5dccf3 (diff)
merge r5013 from branch 2.0 to trunk
feature 1448 added: ability to set the upload directory (for pwg.images.add API method). Warning: due to risk on img src construction, the upload_dir must be relative to the Piwigo directory itself. git-svn-id: http://piwigo.org/svn/trunk@5014 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--include/config_default.inc.php3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/config_default.inc.php b/include/config_default.inc.php
index 972d89ea5..96f89661a 100644
--- a/include/config_default.inc.php
+++ b/include/config_default.inc.php
@@ -759,4 +759,7 @@ $conf['light_slideshow'] = true;
// the local data directory is used to store data such as compiled templates
// 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';
?>