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

Commit

Permalink
Merge branch 'hotfix/3127' into develop
Browse files Browse the repository at this point in the history
Forward port zendframework/zendframework#3127

Conflicts:
	library/Zend/Cache/Storage/Adapter/Memcached.php
	library/Zend/Cache/Storage/Adapter/MemcachedOptions.php
  • Loading branch information
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/Protocol/Imap.php
Original file line number Diff line number Diff line change
Expand Up @@ -547,7 +547,7 @@ public function fetch($items, $from, $to = null)
} elseif ($to === INF) {
$set = (int) $from . ':*';
} else {
$set = (int) $from . ':' . (int)$to;
$set = (int) $from . ':' . (int) $to;
}

$items = (array) $items;
Expand Down
2 changes: 1 addition & 1 deletion src/Protocol/Pop3.php
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@ public function getList($msgno = null)
$line = strtok($result, "\n");
while ($line) {
list($no, $size) = explode(' ', trim($line));
$messages[(int)$no] = (int) $size;
$messages[(int) $no] = (int) $size;
$line = strtok("\n");
}

Expand Down

0 comments on commit d2c581d

Please sign in to comment.