Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Move configuration file to Config/settings.ini

  • Loading branch information...
commit 056a34966c27e681c8c98110c2ad10a7cf89cdab 1 parent 51a6c30
@haraldpdl haraldpdl authored
View
4 .gitignore
@@ -1,2 +1,2 @@
-includes/work/*
-includes/local/config.php
+osCommerce/OM/Work/*
+osCommerce/OM/Config/local_settings.ini
View
0  includes/config.php → osCommerce/OM/Config/settings.ini
File renamed without changes
View
6 osCommerce/OM/Core/OSCOM.php
@@ -117,10 +117,10 @@ public static function getDefaultSiteApplication() {
}
public static function loadConfig() {
- $ini = parse_ini_file('includes/config.php');
+ $ini = parse_ini_file(self::BASE_DIRECTORY . 'Config/settings.ini');
- if ( file_exists('includes/local/config.php') ) {
- $local = parse_ini_file('includes/local/config.php');
+ if ( file_exists(self::BASE_DIRECTORY . 'Config/local_settings.ini') ) {
+ $local = parse_ini_file(self::BASE_DIRECTORY . 'Config/local_settings.ini');
$ini = array_merge($ini, $local);
}
Please sign in to comment.
Something went wrong with that request. Please try again.