diff options
| author | Stephen Reay <stephen.reay@me.com> | 2019-09-19 16:37:58 +0700 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-09-19 17:24:49 +0200 |
| commit | c34de80df8b61967249e07e5748e877d46fd99d2 (patch) | |
| tree | 528f378b34ea3f9cae454ef3532f368d04ecb68d | |
| parent | edfcf2d81f384178c8e1282d43b73c9bbd4e519f (diff) | |
| download | php-git-c34de80df8b61967249e07e5748e877d46fd99d2.tar.gz | |
Convert IMAP function aliases
These are not really aliases, convert them to normal functions.
Closes GH-4725.
| -rw-r--r-- | ext/imap/php_imap.c | 8 | ||||
| -rw-r--r-- | ext/imap/php_imap.h | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c index b5f12f6eee..e178e96b5e 100644 --- a/ext/imap/php_imap.c +++ b/ext/imap/php_imap.c @@ -539,13 +539,13 @@ static const zend_function_entry imap_functions[] = { #endif PHP_FE(imap_mail, arginfo_imap_mail) + PHP_FE(imap_getsubscribed, arginfo_imap_getsubscribed) + PHP_FE(imap_getmailboxes, arginfo_imap_getmailboxes) PHP_FALIAS(imap_header, imap_headerinfo, arginfo_imap_headerinfo) PHP_FALIAS(imap_listmailbox, imap_list, arginfo_imap_list) - PHP_FALIAS(imap_getmailboxes, imap_list_full, arginfo_imap_getmailboxes) PHP_FALIAS(imap_scanmailbox, imap_listscan, arginfo_imap_listscan) PHP_FALIAS(imap_listsubscribed, imap_lsub, arginfo_imap_lsub) - PHP_FALIAS(imap_getsubscribed, imap_lsub_full, arginfo_imap_getsubscribed) PHP_FALIAS(imap_fetchtext, imap_body, arginfo_imap_body) PHP_FALIAS(imap_scan, imap_listscan, arginfo_imap_listscan) PHP_FALIAS(imap_create, imap_createmailbox, arginfo_imap_createmailbox) @@ -1926,7 +1926,7 @@ PHP_FUNCTION(imap_list) /* {{{ proto array imap_getmailboxes(resource stream_id, string ref, string pattern) Reads the list of mailboxes and returns a full array of objects containing name, attributes, and delimiter */ /* Author: CJH */ -PHP_FUNCTION(imap_list_full) +PHP_FUNCTION(imap_getmailboxes) { zval *streamind, mboxob; zend_string *ref, *pat; @@ -2246,7 +2246,7 @@ PHP_FUNCTION(imap_lsub) /* {{{ proto array imap_getsubscribed(resource stream_id, string ref, string pattern) Return a list of subscribed mailboxes, in the same format as imap_getmailboxes() */ /* Author: CJH */ -PHP_FUNCTION(imap_lsub_full) +PHP_FUNCTION(imap_getsubscribed) { zval *streamind, mboxob; zend_string *ref, *pat; diff --git a/ext/imap/php_imap.h b/ext/imap/php_imap.h index c23799976c..c7abcab5b8 100644 --- a/ext/imap/php_imap.h +++ b/ext/imap/php_imap.h @@ -163,10 +163,10 @@ PHP_FUNCTION(imap_fetchtext); PHP_FUNCTION(imap_uid); PHP_FUNCTION(imap_msgno); PHP_FUNCTION(imap_list); -PHP_FUNCTION(imap_list_full); +PHP_FUNCTION(imap_getmailboxes); PHP_FUNCTION(imap_listscan); PHP_FUNCTION(imap_lsub); -PHP_FUNCTION(imap_lsub_full); +PHP_FUNCTION(imap_getsubscribed); PHP_FUNCTION(imap_create); PHP_FUNCTION(imap_rename); PHP_FUNCTION(imap_status); |