Changeset 565 for branches/1.1dev
- Timestamp:
- Apr 5, 2016 6:58:26 PM (8 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/1.1dev/config/boot.inc.php
r549 r565 56 56 57 57 // MySQL connection parameters. 58 if (!empty($_SERVER['DB_ NAME']) && !empty($_SERVER['DB_USER']) && !empty($_SERVER['DB_PASS'])) {58 if (!empty($_SERVER['DB_SERVER']) && !empty($_SERVER['DB_NAME']) && !empty($_SERVER['DB_USER']) && !empty($_SERVER['DB_PASS'])) { 59 59 // We set DB passwords as environment variables in the httpd.conf file, 60 60 // which is readable only by root. 61 $CFG->dbserver = $_SERVER['DB_SERVER']; 61 62 $CFG->database = $_SERVER['DB_NAME']; 62 63 $CFG->username = $_SERVER['DB_USER']; … … 71 72 } 72 73 74 $CFG->dbserver = (!isset($CFG->dbserver) || '' == $CFG->dbserver) ? 'localhost' : $CFG->dbserver; 75 73 76 if (empty($CFG->database) || empty($CFG->username) || !isset($CFG->password)) { // Allow password to be empty string. 74 77 logMsg('Database credentials missing.', LOG_WARNING, __FILE__, __LINE__); … … 76 79 77 80 // Connect to MySQL 78 if ($dbh = mysql_connect( 'localhost', $CFG->username, $CFG->password)) {81 if ($dbh = mysql_connect($CFG->dbserver, $CFG->username, $CFG->password)) { 79 82 // Select database 80 83 mysql_select_db($CFG->database, $dbh); … … 288 291 289 292 SITE_BASE . '/_templates' . PATH_SEPARATOR . 290 CODE_BASE . '/templates' 293 CODE_BASE . '/templates' . PATH_SEPARATOR . 294 295 SITE_BASE . '/../lib' 291 296 ); 292 297
Note: See TracChangeset
for help on using the changeset viewer.