From 1e1b71c6f6102de04e5654ee04596a0dea616d32 Mon Sep 17 00:00:00 2001 From: rvelices Date: Thu, 29 Dec 2011 05:48:16 +0000 Subject: fetaure 2542 replace $conf['local_data_dir'] with $conf['data_location'] and move combined files and image derivatives from local to _data git-svn-id: http://piwigo.org/svn/trunk@12802 68402e56-0260-453c-a942-63ccdbb3a9ee --- include/common.inc.php | 2 ++ 1 file changed, 2 insertions(+) (limited to 'include/common.inc.php') diff --git a/include/common.inc.php b/include/common.inc.php index 5cc3317e7..093aca08a 100644 --- a/include/common.inc.php +++ b/include/common.inc.php @@ -88,6 +88,8 @@ foreach( array( include(PHPWG_ROOT_PATH . 'include/config_default.inc.php'); @include(PHPWG_ROOT_PATH. 'local/config/config.inc.php'); +if (!isset($conf['local_data_dir'])) $conf['local_data_dir'] = realpath(PHPWG_ROOT_PATH.$conf['data_location']); // temp 2.4 for backward compatibility + defined('PWG_LOCAL_DIR') or define('PWG_LOCAL_DIR', 'local/'); -- cgit v1.2.3