mbirth/LuckyCoinkydink
1
0
Fork 0
Code Issues Pull Requests Activity

Allow non-standard port specification

Browse Source
This commit is contained in:
Garvin Hicking 2007-03-30 10:02:05 +00:00
parent 85e3e5b483
commit e33b0b27af
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docs/NEWS
View File

@ -3,6 +3,9 @@
Version 1.2 ()
------------------------------------------------------------------------
* Allow to specify non-default port when using MySQLi
(garvinhicking)
* Show current captcha look in the plugin configuration menu
(garvinhicking)

21
include/db/mysqli.inc.php
View File

@ -230,7 +230,14 @@ function serendipity_db_connect() {
$function = 'mysqli_connect';
$serendipity['dbConn'] = $function($serendipity['dbHost'], $serendipity['dbUser'], $serendipity['dbPass']);
$connparts = explode(':', $serendipity['dbHost']);
if (!empty($connparts[1])) {
// A "hostname:port" connection was specified
$serendipity['dbConn'] = $function($connparts[0], $serendipity['dbUser'], $serendipity['dbPass'], $serendipity['dbName'], $connparts[1]);
} else {
// Connect with default ports
$serendipity['dbConn'] = $function($connparts[0], $serendipity['dbUser'], $serendipity['dbPass']);
}
mysqli_select_db($serendipity['dbConn'], $serendipity['dbName']);
serendipity_db_reconnect();
@ -300,7 +307,17 @@ function serendipity_db_probe($hash, &$errs) {
return false;
}
if (!($c = @mysqli_connect($hash['dbHost'], $hash['dbUser'], $hash['dbPass']))) {
$function = 'mysqli_connect';
$connparts = explode(':', $hash['dbHost']);
if (!empty($connparts[1])) {
// A "hostname:port" connection was specified
$c = @$function($connparts[0], $hash['dbUser'], $hash['dbPass'], $hash['dbName'], $connparts[1]);
} else {
// Connect with default ports
$c = @$function($connparts[0], $hash['dbUser'], $hash['dbPass']);
}
if (!$c) {
$errs[] = 'Could not connect to database; check your settings.';
$errs[] = 'The mySQL error was: ' . mysqli_connect_error();
return false;