From b66e92689573af0b0a73f7bc67da1d2945b19ec7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20S=CC=8Ckoda?= Date: Fri, 23 Nov 2012 20:39:03 +0100 Subject: [PATCH] MDL-36807 use our mysql socket logic in adodb tests --- enrol/database/tests/sync_test.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/enrol/database/tests/sync_test.php b/enrol/database/tests/sync_test.php index 8a32b6a39ed..d70f41b5756 100644 --- a/enrol/database/tests/sync_test.php +++ b/enrol/database/tests/sync_test.php @@ -58,7 +58,11 @@ class enrol_database_testcase extends advanced_testcase { set_config('dbsetupsql', "SET NAMES 'UTF-8'", 'enrol_database'); set_config('dbsybasequoting', '0', 'enrol_database'); if (!empty($CFG->dboptions['dbsocket'])) { - set_config('dbtype', 'mysqli://'.rawurlencode($CFG->dbuser).':'.rawurlencode($CFG->dbpass).'@'.rawurlencode($CFG->dbhost).'/'.rawurlencode($CFG->dbname).'?socket='.rawurlencode($CFG->dboptions['dbsocket']), 'enrol_database'); + $dbsocket = $CFG->dboptions['dbsocket']; + if ((strpos($dbsocket, '/') === false and strpos($dbsocket, '\\') === false)) { + $dbsocket = ini_get('mysqli.default_socket'); + } + set_config('dbtype', 'mysqli://'.rawurlencode($CFG->dbuser).':'.rawurlencode($CFG->dbpass).'@'.rawurlencode($CFG->dbhost).'/'.rawurlencode($CFG->dbname).'?socket='.rawurlencode($dbsocket), 'enrol_database'); } break;