diff options
| author | Remi Collet <remi@php.net> | 2012-11-24 15:01:24 +0100 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2012-11-24 15:01:24 +0100 |
| commit | 7cd2f4b6a6a522c813fc93df00993b77cc43c3a2 (patch) | |
| tree | 788f5266bdfc54a1bf7358f92c6a2706dce99226 | |
| parent | 9d8ed21bd52a730b6dde3a66e3ba544433b61a11 (diff) | |
| parent | f55bed9dad0ffbec170b857c0b3b1b33426fe9d5 (diff) | |
| download | php-git-7cd2f4b6a6a522c813fc93df00993b77cc43c3a2.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Fixed Bug #63126 DISABLE_AUTHENTICATOR ignores array
| -rw-r--r-- | ext/imap/php_imap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c index 32161f3b6c..681af6f585 100644 --- a/ext/imap/php_imap.c +++ b/ext/imap/php_imap.c @@ -1191,7 +1191,7 @@ static void php_imap_do_open(INTERNAL_FUNCTION_PARAMETERS, int persistent) if (zend_hash_index_find(Z_ARRVAL_PP(disabled_auth_method), i, (void **) &z_auth_method) == SUCCESS) { if (Z_TYPE_PP(z_auth_method) == IS_STRING) { if (Z_STRLEN_PP(z_auth_method) > 1) { - mail_parameters (NIL, DISABLE_AUTHENTICATOR, (void *)Z_STRVAL_PP(disabled_auth_method)); + mail_parameters (NIL, DISABLE_AUTHENTICATOR, (void *)Z_STRVAL_PP(z_auth_method)); } } else { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid argument, expect string or array of strings"); |