aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorpatdenice <patdenice@piwigo.org>2010-03-21 13:31:20 +0000
committerpatdenice <patdenice@piwigo.org>2010-03-21 13:31:20 +0000
commit8db5b549d1bd5de7af366611698ee129da09762f (patch)
treebc09666f3f80dc4cf191177269dd0e82c1c5a90b /include
parent545b10474cba8b2e9fb0552b50cbf84ccea40052 (diff)
feature 1522: Move config_local.inc.php to local/config/config.inc.php
git-svn-id: http://piwigo.org/svn/trunk@5215 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'include')
-rw-r--r--include/common.inc.php2
-rw-r--r--include/config_default.inc.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/include/common.inc.php b/include/common.inc.php
index 21029835a..88354b5fe 100644
--- a/include/common.inc.php
+++ b/include/common.inc.php
@@ -90,7 +90,7 @@ foreach( array(
}
include(PHPWG_ROOT_PATH . 'include/config_default.inc.php');
-@include(PHPWG_ROOT_PATH. 'include/config_local.inc.php');
+@include(PHPWG_ROOT_PATH. 'local/config/config.inc.php');
include(PHPWG_ROOT_PATH .'include/dblayer/functions_'.$conf['dblayer'].'.inc.php');
if(isset($conf['show_php_errors']) && !empty($conf['show_php_errors']))
diff --git a/include/config_default.inc.php b/include/config_default.inc.php
index c72f460ba..6a1b217de 100644
--- a/include/config_default.inc.php
+++ b/include/config_default.inc.php
@@ -30,7 +30,7 @@
*
* It is recommended to let config_default.inc.php as provided and to
* overwrite configuration in your local configuration file
- * config_local.inc.php. See tools/config_local.inc.php as an example.
+ * local/config/config.inc.php. See tools/config.inc.php as an example.
*
* Why having some parameters in config table and others in
* config_*.inc.php? Modifying config_*.inc.php is a "hard" task for low