php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-24 08:28:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Don't expect a path for tidy_repair_string() and fix the tests

Browse Source
This commit is contained in:
Rasmus Lerdorf
2011-06-12 14:49:10 +00:00
parent 7a0bd8b967
commit fb2ce0bb00
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ext/tidy/tests/019.phpt
+1 -1
View File
@@ -38,5 +38,5 @@ Warning: tidy_repair_file(): Filename cannot be empty in %s on line %d
Warning: tidy_repair_file(): Filename cannot be empty in %s on line %d
Warning: tidy_repair_file() expects parameter 1 to be string, array given in %s on line %d
Warning: tidy_repair_file() expects parameter 1 to be a valid path, array given in %s on line %d
Done
ext/tidy/tests/022.phpt
+1 -1
View File
@@ -38,5 +38,5 @@ Warning: tidy_repair_file(): Filename cannot be empty in %s on line %d
Warning: tidy_repair_file(): Filename cannot be empty in %s on line %d
Warning: tidy_repair_file() expects parameter 1 to be string, array given in %s on line %d
Warning: tidy_repair_file() expects parameter 1 to be a valid path, array given in %s on line %d
Done
ext/tidy/tidy.c
+6 -4
View File
@@ -558,15 +558,17 @@ static void php_tidy_quick_repair(INTERNAL_FUNCTION_PARAMETERS, zend_bool is_fil
TidyBuffer *errbuf;
zval **config = NULL;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "p|Zsb", &arg1, &arg1_len, &config, &enc, &enc_len, &use_include_path) == FAILURE) {
RETURN_FALSE;
}
if (is_file) {
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "p|Zsb", &arg1, &arg1_len, &config, &enc, &enc_len, &use_include_path) == FAILURE) {
RETURN_FALSE;
}
if (!(data = php_tidy_file_to_mem(arg1, use_include_path, &data_len TSRMLS_CC))) {
RETURN_FALSE;
}
} else {
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|Zsb", &arg1, &arg1_len, &config, &enc, &enc_len, &use_include_path) == FAILURE) {
RETURN_FALSE;
}
data = arg1;
data_len = arg1_len;
}