aboutsummaryrefslogtreecommitdiffstats
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
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
-rw-r--r--doc/ChangeLog7
-rw-r--r--include/common.inc.php3
-rw-r--r--include/config_default.inc.php (renamed from include/config.inc.php)16
3 files changed, 19 insertions, 7 deletions
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 67840931e..b1d7224bc 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,5 +1,12 @@
2005-04-25 Pierrick LE GALL
+ * 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
+
+2005-04-25 Pierrick LE GALL
+
* come back to previous version of include/constants.php :
%PWGVERSION% was not a mistake
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');
diff --git a/include/config.inc.php b/include/config_default.inc.php
index 27001795a..0fea39a78 100644
--- a/include/config.inc.php
+++ b/include/config_default.inc.php
@@ -30,13 +30,17 @@
*
* Set configuration parameters that are not in the table config. In the
* application, configuration parameters are considered in the same way
- * coming from config table or config.inc.php.
+ * coming from config table or config_default.inc.php.
*
- * Why having some parameters in config table and others in config.inc.php ?
- * Modifying config.inc.php is a "hard" task for low skilled users, they
- * need a GUI for this : admin/configuration. But only parameters that might
- * be modified by low skilled users are in config table, other parameters
- * are in config.inc.php
+ * It is recommended to let config_default.inc.php as provided and to
+ * overwrite configuration in your local configuration file
+ * config_local.inc.php
+ *
+ * Why having some parameters in config table and others in
+ * config_*.inc.php? Modifying config_*.inc.php is a "hard" task for low
+ * skilled users, they need a GUI for this : admin/configuration. But only
+ * parameters that might be modified by low skilled users are in config
+ * table, other parameters are in config_*.inc.php
*/
// order_by : how to change the order of display for images in a category ?