diff options
| author | Ilia Alshanetsky <iliaa@php.net> | 2004-09-26 19:24:18 +0000 |
|---|---|---|
| committer | Ilia Alshanetsky <iliaa@php.net> | 2004-09-26 19:24:18 +0000 |
| commit | d5bac133ee87aac7f5a09a33aa1b409b52a42657 (patch) | |
| tree | 50f237cffefaa7ed70b8db01e11885baf520d676 | |
| parent | d6501f756a4eb1a07606b700583f46b7ff735c4c (diff) | |
| download | php-git-d5bac133ee87aac7f5a09a33aa1b409b52a42657.tar.gz | |
Return FALSE when file cannot be found.
Specify full paths to the files used for the test.
| -rw-r--r-- | ext/tidy/tests/016.phpt | 3 | ||||
| -rw-r--r-- | ext/tidy/tidy.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/ext/tidy/tests/016.phpt b/ext/tidy/tests/016.phpt index 660b85e337..f4f0752601 100644 --- a/ext/tidy/tests/016.phpt +++ b/ext/tidy/tests/016.phpt @@ -4,7 +4,8 @@ Passing configuration file through tidy_parse_file() <?php if (!extension_loaded("tidy")) print "skip"; ?> --FILE-- <?php - $tidy = tidy_parse_file("ext/tidy/tests/016.html", "ext/tidy/tests/016.tcfg"); + $path = dirname(__FILE__); + $tidy = tidy_parse_file("{$path}/016.html", "{$path}/016.tcfg"); tidy_clean_repair($tidy); echo tidy_get_output($tidy); ?> diff --git a/ext/tidy/tidy.c b/ext/tidy/tidy.c index a64d7c6444..7a87300a7e 100644 --- a/ext/tidy/tidy.c +++ b/ext/tidy/tidy.c @@ -1088,7 +1088,7 @@ PHP_FUNCTION(tidy_parse_file) if (!(contents = php_tidy_file_to_mem(inputfile, use_include_path TSRMLS_CC))) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot Load '%s' into memory %s", inputfile, (use_include_path) ? "(Using include path)" : ""); - return; + RETURN_FALSE; } TIDY_APPLY_CONFIG_ZVAL(obj->ptdoc->doc, options); |