aboutsummaryrefslogtreecommitdiffstats
path: root/include/common.inc.php
diff options
context:
space:
mode:
authorrvelices <rv-github@modusoptimus.com>2012-08-27 18:32:10 +0000
committerrvelices <rv-github@modusoptimus.com>2012-08-27 18:32:10 +0000
commita6c33e933252b3b9f0b3efc86b73782d15d0ad4a (patch)
tree7b9ab0253b739c56a7340e77b8cfa484e6ea193a /include/common.inc.php
parentec41085ce7a5c142e4fce3c156f9bd54d21c881c (diff)
remove deprecated function get_thumbnail_url + $conf['local_data_dir']
git-svn-id: http://piwigo.org/svn/trunk@17649 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--include/common.inc.php2
1 files changed, 0 insertions, 2 deletions
diff --git a/include/common.inc.php b/include/common.inc.php
index 49a46028c..7c645a236 100644
--- a/include/common.inc.php
+++ b/include/common.inc.php
@@ -86,11 +86,9 @@ 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/');
-
@include(PHPWG_ROOT_PATH.PWG_LOCAL_DIR .'config/database.inc.php');
if (!defined('PHPWG_INSTALLED'))
{