jenkins-bot has submitted this change and it was merged.

Change subject: DatabaseInstaller::setVarsFromRequest needs array
......................................................................


DatabaseInstaller::setVarsFromRequest needs array

Method is not marked as var args.

Bug: 58434
Follow-Up: I920b0231db1b70b68c6c8907257c288a0e112668
Change-Id: Ief7f7c06e75efbe7ae1da13f5021a9062483f690
(cherry picked from commit 29c2ab3da0d561428f1fc969daadcac463e675b6)
---
M RELEASE-NOTES-1.22
M includes/installer/OracleInstaller.php
2 files changed, 12 insertions(+), 2 deletions(-)

Approvals:
  MarkAHershberger: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/RELEASE-NOTES-1.22 b/RELEASE-NOTES-1.22
index 46f31ba..0a377a5 100644
--- a/RELEASE-NOTES-1.22
+++ b/RELEASE-NOTES-1.22
@@ -1,6 +1,16 @@
+= MediaWiki release notes =
+
 Security reminder: MediaWiki does not require PHP's register_globals. If you
 have it on, turn it '''off''' if you can.
 
+== MediaWiki 1.22.1 ==
+
+This is a security and maintenance release of the MediaWiki 1.22 branch.
+
+=== Changes since 1.22.0 ===
+
+* (bug 58434) The broken installer for database backend Oracle was fixed.
+
 == MediaWiki 1.22.0 ==
 
 MediaWiki 1.22.0 is the stable branch and is recommended for use in production.
diff --git a/includes/installer/OracleInstaller.php 
b/includes/installer/OracleInstaller.php
index 7757510..8ce74f4 100644
--- a/includes/installer/OracleInstaller.php
+++ b/includes/installer/OracleInstaller.php
@@ -91,12 +91,12 @@
 
        public function submitConnectForm() {
                // Get variables from the request
-               $newValues = $this->setVarsFromRequest(
+               $newValues = $this->setVarsFromRequest( array(
                        'wgDBserver',
                        'wgDBprefix',
                        'wgDBuser',
                        'wgDBpassword'
-               );
+               ) );
                $this->parent->setVar( 'wgDBname', $this->getVar( 'wgDBuser' ) 
);
 
                // Validate them

-- 
To view, visit https://gerrit.wikimedia.org/r/105985
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ief7f7c06e75efbe7ae1da13f5021a9062483f690
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_22
Gerrit-Owner: Siebrand <siebr...@wikimedia.org>
Gerrit-Reviewer: Legoktm <legoktm.wikipe...@gmail.com>
Gerrit-Reviewer: MarkAHershberger <mhershber...@wikimedia.org>
Gerrit-Reviewer: Mglaser <gla...@hallowelt.biz>
Gerrit-Reviewer: Siebrand <siebr...@wikimedia.org>
Gerrit-Reviewer: Umherirrender <umherirrender_de...@web.de>
Gerrit-Reviewer: jenkins-bot

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to