iarv/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-03-28 17:42:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

merge r22181 from branch 2.5 to trunk

Browse Source 
bug 2865: mysqli can now handle socket and specific port number


git-svn-id: http://piwigo.org/svn/trunk@22182 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
plegall
2013-04-12 21:59:42 +00:00
parent 12dd40060d
commit fc8b781ddd
1 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
include/dblayer/functions_mysqli.inc.php
View File

@@ -36,8 +36,29 @@ define('DB_RANDOM_FUNCTION', 'RAND');
function pwg_db_connect($host, $user, $password, $database)
{
global $mysqli;
// exemples of $host
//
// $host = localhost
// $host = 1.2.3.4:3405
// $host = /path/to/socket
$port = null;
$socket = null;
$mysqli = new mysqli($host, $user, $password);
if (strpos($host, '/') === 0)
{
$host = null;
$socket = $host;
}
elseif (strpos($host, ':') !== false)
{
list($host, $port) = explode(':', $host);
}
$dbname = null;
$mysqli = new mysqli($host, $user, $password, $dbname, $port, $socket);
if (mysqli_connect_error())
{
throw new Exception("Can't connect to server");