Skip to content
This repository has been archived by the owner on Jan 31, 2020. It is now read-only.

Commit

Permalink
Merge branch 'hotfix/2878' into develop
Browse files Browse the repository at this point in the history
Conflicts:
	library/Zend/File/Transfer/Adapter/AbstractAdapter.php
	library/Zend/File/Transfer/Adapter/Http.php
	tests/ZendTest/Log/Writer/AbstractTest.php
	tests/ZendTest/Log/Writer/DbTest.php
  • Loading branch information
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/Http.php
Original file line number Diff line number Diff line change
Expand Up @@ -172,8 +172,8 @@ protected function parseUserInfo()
public function getPort()
{
if (empty($this->port)) {
if (array_key_exists($this->scheme, self::$defaultPorts)) {
return self::$defaultPorts[$this->scheme];
if (array_key_exists($this->scheme, static::$defaultPorts)) {
return static::$defaultPorts[$this->scheme];
}
}
return $this->port;
Expand Down

0 comments on commit 30cabda

Please sign in to comment.