cvs: php-src(PHP_5_0) /ext/tidy tidy.c /ext/tidy/tests 016.phpt

From: Date: Sun, 26 Sep 2004 19:24:20 +0000
Subject: cvs: php-src(PHP_5_0) /ext/tidy tidy.c /ext/tidy/tests 016.phpt
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-28786@lists.php.net to get a copy of this message
iliaa Sun Sep 26 15:24:20 2004 EDT Modified files: (Branch: PHP_5_0) /php-src/ext/tidy tidy.c /php-src/ext/tidy/tests 016.phpt Log: MFH: Return FALSE when file cannot be found. Specify full paths to the files used for the test. http://cvs.php.net/diff.php/php-src/ext/tidy/tidy.c?r1=1.56.2.1&r2=1.56.2.2&ty=u Index: php-src/ext/tidy/tidy.c diff -u php-src/ext/tidy/tidy.c:1.56.2.1 php-src/ext/tidy/tidy.c:1.56.2.2 --- php-src/ext/tidy/tidy.c:1.56.2.1 Wed Aug 4 12:39:56 2004 +++ php-src/ext/tidy/tidy.c Sun Sep 26 15:24:20 2004 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: tidy.c,v 1.56.2.1 2004/08/04 16:39:56 zeev Exp $ */ +/* $Id: tidy.c,v 1.56.2.2 2004/09/26 19:24:20 iliaa Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -952,7 +952,7 @@ php_info_print_table_start(); php_info_print_table_header(2, "Tidy support", "enabled"); php_info_print_table_row(2, "libTidy Release", (char *)tidyReleaseDate()); - php_info_print_table_row(2, "Extension Version", PHP_TIDY_MODULE_VERSION " ($Id: tidy.c,v 1.56.2.1 2004/08/04 16:39:56 zeev Exp $)"); + php_info_print_table_row(2, "Extension Version", PHP_TIDY_MODULE_VERSION " ($Id: tidy.c,v 1.56.2.2 2004/09/26 19:24:20 iliaa Exp $)"); php_info_print_table_end(); DISPLAY_INI_ENTRIES(); @@ -1088,7 +1088,7 @@ 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); http://cvs.php.net/diff.php/php-src/ext/tidy/tests/016.phpt?r1=1.2&r2=1.2.2.1&ty=u Index: php-src/ext/tidy/tests/016.phpt diff -u php-src/ext/tidy/tests/016.phpt:1.2 php-src/ext/tidy/tests/016.phpt:1.2.2.1 --- php-src/ext/tidy/tests/016.phpt:1.2 Wed May 19 04:45:23 2004 +++ php-src/ext/tidy/tests/016.phpt Sun Sep 26 15:24:20 2004 @@ -4,7 +4,8 @@ <?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); ?>

« previous php.cvs (#28786) next »