-
Notifications
You must be signed in to change notification settings - Fork 7.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix #64076: imap_sort() does not return FALSE on failure
If unsupported `$search_criteria` are passed to `imap_sort()`, the function returns an empty array, but there is also an error on the libc-client error stack ("Unknown search criterion: UNSUPPORTED (errflg=2)"). If, on the other hand, unsupported `$criteria` or unsupported `$flags` are passed, the function returns `false`. We solve this inconsistency by returning `false` for unsupported `$search_criteria` as well. Closes GH-6332.
- Loading branch information
Showing
3 changed files
with
28 additions
and
0 deletions.
There are no files selected for viewing
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
--TEST-- | ||
Bug #64076 (imap_sort() does not return FALSE on failure) | ||
--SKIPIF-- | ||
<?php | ||
require_once __DIR__ . '/skipif.inc'; | ||
?> | ||
--FILE-- | ||
<?php | ||
require_once __DIR__ . '/imap_include.inc'; | ||
$stream = setup_test_mailbox('', 2); | ||
imap_errors(); // clear error stack | ||
var_dump(imap_sort($stream, SORTFROM, 0, 0, 'UNSUPPORTED SEARCH CRITERIUM')); | ||
var_dump(imap_errors() !== false); | ||
?> | ||
--CLEAN-- | ||
<?php | ||
require_once __DIR__ . '/clean.inc'; | ||
?> | ||
--EXPECT-- | ||
Create a temporary mailbox and add 2 msgs | ||
.. mailbox '{127.0.0.1:143/norsh}INBOX.phpttest' created | ||
bool(false) | ||
bool(true) |