archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

map fixes

Browse source
This commit is contained in:
Stanislav Malyshev 2015-01-25 00:04:18 -08:00
parent cb6fb59b59
commit f1b2adb881
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ext/imap/php_imap.c
View file

@ -3999,7 +3999,7 @@ PHP_FUNCTION(imap_mail)
zend_string *to=NULL, *message=NULL, *headers=NULL, *subject=NULL, *cc=NULL, *bcc=NULL, *rpath=NULL;
int argc = ZEND_NUM_ARGS();
if (zend_parse_parameters(argc, "SSS|SSSS", &to, &subject, &message,
if (zend_parse_parameters(argc, "SSS|SSSS", &to, &subject, &message,
&headers, &cc, &bcc, &rpath) == FAILURE) {
return;
}
@ -4023,7 +4023,8 @@ PHP_FUNCTION(imap_mail)
message = NULL;
}
if (_php_imap_mail(to->val, subject->val, message->val, headers->val, cc->val, bcc->val, rpath->val)) {
if (_php_imap_mail(to->val, subject->val, message->val, headers?headers->val:NULL, cc?cc->val:NULL,
bcc?bcc->val:NULL, rpath?rpath->val:NULL)) {
RETURN_TRUE;
} else {
RETURN_FALSE;
@ -4044,7 +4045,7 @@ PHP_FUNCTION(imap_search)
int argc = ZEND_NUM_ARGS();
SEARCHPGM *pgm = NIL;
if (zend_parse_parameters(argc, "rs|ls", &streamind, &criteria, &flags, &charset) == FAILURE) {
if (zend_parse_parameters(argc, "rs|lS", &streamind, &criteria, &flags, &charset) == FAILURE) {
return;
}