Permalink
Browse files

load either the developers configure.php file or the server file, not…

… both.
  • Loading branch information...
haraldpdl committed Nov 7, 2010
1 parent a0b9b24 commit 5d43dfe2b2979ae60dc77facb86b6af5c00961b8
Showing with 12 additions and 10 deletions.
  1. +6 −5 catalog/admin/includes/application_top.php
  2. +6 −5 catalog/includes/application_top.php
@@ -21,11 +21,12 @@
exit('Server Requirement Error: register_globals is disabled in your PHP configuration. This can be enabled in your php.ini configuration file or in the .htaccess file in your catalog directory. Please use PHP 4.3+ if register_globals cannot be enabled on the server.');
}
-// Set the local configuration parameters - mainly for developers
- if (file_exists('includes/local/configure.php')) include('includes/local/configure.php');
-
-// Include application configuration parameters
- require('includes/configure.php');
+// load server configuration parameters
+ if (file_exists('includes/local/configure.php')) { // for developers
+ include('includes/local/configure.php');
+ } else {
+ include('includes/configure.php');
+ }
// Define the project version --- obsolete, now retrieved with tep_get_version()
define('PROJECT_VERSION', 'osCommerce Online Merchant v2.3');
@@ -21,11 +21,12 @@
exit('Server Requirement Error: register_globals is disabled in your PHP configuration. This can be enabled in your php.ini configuration file or in the .htaccess file in your catalog directory. Please use PHP 4.3+ if register_globals cannot be enabled on the server.');
}
-// Set the local configuration parameters - mainly for developers
- if (file_exists('includes/local/configure.php')) include('includes/local/configure.php');
-
-// include server parameters
- require('includes/configure.php');
+// load server configuration parameters
+ if (file_exists('includes/local/configure.php')) { // for developers
+ include('includes/local/configure.php');
+ } else {
+ include('includes/configure.php');
+ }
if (strlen(DB_SERVER) < 1) {
if (is_dir('install')) {

0 comments on commit 5d43dfe

Please sign in to comment.