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

7 files changed, 7 insertions, 7 deletions

diff --git a/install/db/12-database.php b/install/db/12-database.php
index 21c4ef940..0536d0cb0 100644
--- a/install/db/12-database.php
+++ b/install/db/12-database.php
@@ -30,7 +30,7 @@ $upgrade_description = 'Field "Status" Table #user_infos changed';
 
 include_once(PHPWG_ROOT_PATH.'include/constants.php');
 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');
 
 // +-----------------------------------------------------------------------+
 // |                            Upgrade content                            |
diff --git a/install/db/14-database.php b/install/db/14-database.php
index 6374ef25f..7513191e8 100644
--- a/install/db/14-database.php
+++ b/install/db/14-database.php
@@ -30,7 +30,7 @@ $upgrade_description = 'Update database to new pwg_high structure';
 
 include_once(PHPWG_ROOT_PATH.'include/constants.php');
 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');
 
 // +-----------------------------------------------------------------------+
 // |                            Upgrade content                            |
diff --git a/install/db/60-database.php b/install/db/60-database.php
index 074c57262..e74d25c78 100644
--- a/install/db/60-database.php
+++ b/install/db/60-database.php
@@ -30,7 +30,7 @@ $upgrade_description = 'Change default value on #user_infos for guest';
 
 include_once(PHPWG_ROOT_PATH.'include/constants.php');
 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');
 
 // +-----------------------------------------------------------------------+
 // |                            Upgrade content                            |
diff --git a/install/db/65-database.php b/install/db/65-database.php
index 9f732b86f..e934d14fc 100644
--- a/install/db/65-database.php
+++ b/install/db/65-database.php
@@ -135,7 +135,7 @@ SELECT language, COUNT(user_id) AS count FROM '.USER_INFOS_TABLE.'
 // +-----------------------------------------------------------------------+
 // get admin charset
   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');
   $admin_charset='iso-8859-1';
   $query='
 SELECT language FROM '.USER_INFOS_TABLE.'
diff --git a/install/db/8-database.php b/install/db/8-database.php
index b9b00b565..2b59bd51b 100644
--- a/install/db/8-database.php
+++ b/install/db/8-database.php
@@ -40,7 +40,7 @@ $params = array(
 
 $conf_save = $conf;
 unset($conf);
-@include(PHPWG_ROOT_PATH. 'include/config_local.inc.php');
+@include(PHPWG_ROOT_PATH. 'local/config/config.inc.php');
 if ( isset($conf['gallery_url']) )
 {
   $params['gallery_url'][0] = $conf['gallery_url'];
diff --git a/install/upgrade_1.4.0.php b/install/upgrade_1.4.0.php
index 0a7175aae..db482416a 100644
--- a/install/upgrade_1.4.0.php
+++ b/install/upgrade_1.4.0.php
@@ -282,7 +282,7 @@ if ($prefix_thumbnail != 'TN-')
   array_push(
     $page['infos'],
     'the thumbnail prefix configuration parameter was moved to configuration
-file, copy config_local.inc.php from "tools" directory to "include" directory
+file, copy config.inc.php from "tools" directory to "local/config" directory
 and edit $conf[\'prefix_thumbnail\'] = '.$prefix_thumbnail
     );
 }
diff --git a/install/upgrade_1.5.0.php b/install/upgrade_1.5.0.php
index 977105125..910198803 100644
--- a/install/upgrade_1.5.0.php
+++ b/install/upgrade_1.5.0.php
@@ -333,7 +333,7 @@ $params = array(
 // Get real values from config file
 $conf_save = $conf;
 unset($conf);
-@include(PHPWG_ROOT_PATH. 'include/config_local.inc.php');
+@include(PHPWG_ROOT_PATH. 'local/config/config.inc.php');
 if ( isset($conf['gallery_url']) )
 {
   $params['gallery_url'][0] = $conf['gallery_url'];