Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[5.3] Added check for empty port to prevent Invalid Handler Error #16824

Merged
merged 2 commits into from
Dec 16, 2016
Merged

[5.3] Added check for empty port to prevent Invalid Handler Error #16824

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3732d57
Added check for empty port.
kharysharpe Dec 16, 2016
036f08e
Fixed style guide
kharysharpe Dec 16, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Illuminate/Database/Connectors/SqlServerConnector.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ protected function buildConnectString($driver, array $arguments)
*/
protected function buildHostString(array $config, $separator)
{
if (isset($config['port'])) {
if (isset($config['port']) && ! empty($config['port'])) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This can be shortened to simply if (! empty($config['port']))

return $config['host'].$separator.$config['port'];
} else {
return $config['host'];
Expand Down