jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/363717 )
Change subject: Add null port to fix install requirements
......................................................................
Add null port to fix install requirements
Change-Id: I2ad9c788a06b0f3fff7fe15ae1450d53db621129
---
M install/index.php
1 file changed, 1 insertion(+), 2 deletions(-)
Approvals:
jenkins-bot: Verified
Ejegg: Looks good to me, approved
diff --git a/install/index.php b/install/index.php
index 79010ff..ccdbed1 100644
--- a/install/index.php
+++ b/install/index.php
@@ -569,7 +569,7 @@
$host = implode(':', $hostParts);
}
else {
- $port = '';
+ $port = null;
}
$conn = @mysqli_connect($host, $username, $password, $database, $port);
return $conn;
@@ -1268,7 +1268,6 @@
) {
$this->testing($testDetails);
$conn = $this->connect($server, $username, $password);
-
$okay = NULL;
if (@mysqli_select_db($conn, $database)) {
$okay = "Database '$database' exists";
--
To view, visit https://gerrit.wikimedia.org/r/363717
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2ad9c788a06b0f3fff7fe15ae1450d53db621129
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm/civicrm
Gerrit-Branch: master
Gerrit-Owner: Mepps <[email protected]>
Gerrit-Reviewer: Ejegg <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
