Commit 6717947

committed

Fix GH-18015: Error messages for ldap_mod_replace are confusing

1 parent 4b9c72f commit 6717947Copy full SHA for 6717947

File tree

-2

lines changed

-2

lines changed

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,10 @@ PHP NEWS`
`39`	`39`	`. Fixed bug GH-17984 (calls with arguments as array with references).`
`40`	`40`	`(David Carlier)`
`41`	`41`
	`42`	`+- LDAP:`
	`43`	`+ . Fixed bug GH-18015 (Error messages for ldap_mod_replace are confusing).`
	`44`	`+ (nielsdos)`
	`45`	`+`
`42`	`46`	`- Mbstring:`
`43`	`47`	`. Fixed bug GH-17989 (mb_output_handler crash with unset`
`44`	`48`	`http_output_conv_mimetypes). (nielsdos)`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2278,7 +2278,7 @@ static void php_ldap_do_modify(INTERNAL_FUNCTION_PARAMETERS, int oper, int ext)`
`2278`	`2278`	`ldap_mods[i]->mod_bvalues[0]->bv_len = Z_STRLEN_P(value);`
`2279`	`2279`	`} else {`
`2280`	`2280`	`if (!php_ldap_is_numerically_indexed_array(Z_ARRVAL_P(value))) {`
`2281`		`- zend_argument_value_error(3, "must be an array with numeric keys");`
	`2281`	`+ zend_argument_value_error(3, "attribute \"%s\" must be an array with numeric keys", ZSTR_VAL(attribute));`
`2282`	`2282`	`RETVAL_FALSE;`
`2283`	`2283`	`num_berval[i] = 0;`
`2284`	`2284`	`num_attribs = i + 1;`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ Warning: ldap_add(): Add: Already exists in %s on line %d`
`104`	`104`	`bool(false)`
`105`	`105`	`string(14) "Already exists"`
`106`	`106`	`int(68)`
`107`		`-ldap_add(): Argument #3 ($entry) must be an array with numeric keys`
	`107`	`+ldap_add(): Argument #3 ($entry) attribute "objectdiff-ff1d5879b5ede105769d77c6e9242b83b2de0751065f2ce46cf391110bed3ed1-108-108-0" data-selected="false" role="gridcell" tabindex="-1">108`	`108`
`109`	`109`	`Warning: ldap_add(): Add: Undefined attribute type in %s on line %d`
`110`	`110`	`bool(false)`

Comments

(0)