kashire/lainchan
4
0
Fork 0
Code Issues 18 Pull Requests Releases Wiki Activity

Fixed bug suppressing any output when mysql is not installed/enabled.

Browse Source 
(cherry picked from commit 9f9861ad20)
This commit is contained in:
Savetheinternet 2010-12-01 21:39:34 +11:00 committed by Paul Merrill
parent 2dcc1d96db
commit a1c77c3d17
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
test.php
View File

@ -43,19 +43,21 @@
// Database
title('Database');
if($sql = @mysql_connect(MY_SERVER, MY_USER, MY_PASSWORD)) {
$body .= check('Connection to server.', 'ok');
if(@mysql_select_db(MY_DATABASE, $sql))
$body .= check('Select database.', 'ok');
else {
$body .= check('Select database.', 'error');
if(extension_loaded('mysql')) {
if($sql = @mysql_connect(MY_SERVER, MY_USER, MY_PASSWORD)) {
$body .= check('Connection to server.', 'ok');
if(@mysql_select_db(MY_DATABASE, $sql))
$body .= check('Select database.', 'ok');
else {
$body .= check('Select database.', 'error');
$todo[] = 'instance-config.php: Check database configuration.';
}
} else {
$body .= check('Connection to server.', 'error');
$todo[] = 'instance-config.php: Check database configuration.';
}
} else {
$body .= check('Connection to server.', 'error');
$todo[] = 'instance-config.php: Check database configuration.';
}
// Configuration
title('Configuration');
$root = dirname($_SERVER['REQUEST_URI']) . (dirname($_SERVER['REQUEST_URI']) == '/' ? '' : '/');