FIX: PDOConnector ssl_cipher bug fixes #7258 #7259
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
tractorcow
suggested changes
Aug 8, 2017
model/connect/PDOConnector.php
Outdated
| @@ -181,7 +181,7 @@ public function connect($parameters, $selectDB = false) { | |||
| } | |||
|
|
|||
| // use default cipher if not provided | |||
| $options[PDO::MYSQL_ATTR_SSL_CIPHER] = $parameters['ssl_cipher'] ?: Config::inst()->get('PDOConnector', 'ssl_cipher_default'); | |||
| $options[PDO::MYSQL_ATTR_SSL_CIPHER] = array_key_exists($parameters['ssl_cipher']) ? $parameters['ssl_cipher'] : Config::inst()->get('PDOConnector', 'ssl_cipher_default'); | |||
There was a problem hiding this comment.
Please use isset() or !empty(). array_key_exists takes two parameters.
There was a problem hiding this comment.
Sorry about that, will revise now.
|
@dhensby @tractorcow Bug Fix for #7258 |
21b8603 to
1a4a006
Compare
|
@tractorcow Fixed. Retained the use of |
tractorcow
approved these changes
Aug 8, 2017
|
Can be merged on green. |
|
@tractorcow Alright, thanks! Can you kindly take a look at #7254 when you have time? Thank you. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes
ssl_cipher is undefined errorwhen installing Silverstripe via CLI using MySQL PDOConnector