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 --- install.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'install.php') diff --git a/install.php b/install.php index 1ba8ab5ca..17c1c578f 100644 --- a/install.php +++ b/install.php @@ -110,9 +110,9 @@ include(PHPWG_ROOT_PATH . 'include/config_default.inc.php'); defined('PWG_LOCAL_DIR') or define('PWG_LOCAL_DIR', 'local/'); // download database config file if exists -if (!empty($_GET['dl']) && file_exists($conf['local_data_dir'].'/pwg_'.$_GET['dl'])) +if (!empty($_GET['dl']) && file_exists(PHPWG_ROOT_PATH.$conf['data_location'].'pwg_'.$_GET['dl'])) { - $filename = $conf['local_data_dir'].'/pwg_'.$_GET['dl']; + $filename = PHPWG_ROOT_PATH.$conf['data_location'].'pwg_'.$_GET['dl']; header('Cache-Control: no-cache, must-revalidate'); header('Pragma: no-cache'); header('Content-Disposition: attachment; filename="database.inc.php"'); @@ -281,7 +281,7 @@ define(\'DB_COLLATE\', \'\'); if ( !($fp = @fopen( $config_file, 'w' ))) { $tmp_filename = md5(uniqid(time())); - $fh = @fopen( $conf['local_data_dir'] . '/pwg_' . $tmp_filename, 'w' ); + $fh = @fopen( PHPWG_ROOT_PATH.$conf['data_location'] . 'pwg_' . $tmp_filename, 'w' ); @fputs($fh, $file_content, strlen($file_content)); @fclose($fh); -- cgit v1.2.3