aboutsummaryrefslogtreecommitdiffstats
path: root/include/common.inc.php
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2005-04-25 22:11:57 +0000
committerplegall <plg@piwigo.org>2005-04-25 22:11:57 +0000
commit9ea0ae39f8517bcd898c80999ea860fa6961d1d8 (patch)
treef7643a6a7426100f7925a4bb0da6c58f9dc4a411 /include/common.inc.php
parenta5830667021cee44c165de103237ea4f6924ceb5 (diff)
- include/config.inc.php becomes include/config_default.inc.php : this file
should not be modified. A new file include/config_local.inc.php can be used for overwriting configuration parameters git-svn-id: http://piwigo.org/svn/trunk@770 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'include/common.inc.php')
-rw-r--r--include/common.inc.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/common.inc.php b/include/common.inc.php
index 1672f42ba..a57e00641 100644
--- a/include/common.inc.php
+++ b/include/common.inc.php
@@ -121,7 +121,8 @@ if (!defined('PHPWG_INSTALLED'))
}
include(PHPWG_ROOT_PATH . 'include/constants.php');
-include(PHPWG_ROOT_PATH . 'include/config.inc.php');
+include(PHPWG_ROOT_PATH . 'include/config_default.inc.php');
+@include(PHPWG_ROOT_PATH. 'include/config_local.inc.php');
include(PHPWG_ROOT_PATH . 'include/functions.inc.php');
include(PHPWG_ROOT_PATH . 'include/template.php');