diff options
author | rvelices <rv-github@modusoptimus.com> | 2011-12-29 05:48:16 +0000 |
---|---|---|
committer | rvelices <rv-github@modusoptimus.com> | 2011-12-29 05:48:16 +0000 |
commit | 1e1b71c6f6102de04e5654ee04596a0dea616d32 (patch) | |
tree | 1145317096610e5d5039b11d955b43c662636351 /include/dblayer | |
parent | 5331c7f9401ee96fcf8f7aee6cb74c03fb5cdcb5 (diff) |
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
Diffstat (limited to 'include/dblayer')
-rw-r--r-- | include/dblayer/functions_pdo-sqlite.inc.php | 2 | ||||
-rw-r--r-- | include/dblayer/functions_sqlite.inc.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/dblayer/functions_pdo-sqlite.inc.php b/include/dblayer/functions_pdo-sqlite.inc.php index a5b4af600..12348fd5c 100644 --- a/include/dblayer/functions_pdo-sqlite.inc.php +++ b/include/dblayer/functions_pdo-sqlite.inc.php @@ -37,7 +37,7 @@ function pwg_db_connect($host, $user, $password, $database) { global $conf; - $db_file = sprintf('sqlite:%s/%s.db', $conf['local_data_dir'], $database); + $db_file = sprintf('sqlite:%s/%s.db', PHPWG_ROOT_PATH.$conf['data_location'], $database); $link = new PDO($db_file); if (!$link) diff --git a/include/dblayer/functions_sqlite.inc.php b/include/dblayer/functions_sqlite.inc.php index b260e7ada..c93923a3e 100644 --- a/include/dblayer/functions_sqlite.inc.php +++ b/include/dblayer/functions_sqlite.inc.php @@ -37,7 +37,7 @@ function pwg_db_connect($host, $user, $password, $database) { global $conf; - $db_file = sprintf('%s/%s.db', $conf['local_data_dir'], $database); + $db_file = sprintf('%s/%s.db', PHPWG_ROOT_PATH.$conf['data_location'], $database); if (script_basename()=='install') { |