john Fri May 28 16:32:52 2004 EDT
Modified files:
/php-src/ext/tidy tidy.c
Log:
'tidy' should not be final, but 'tidyNode' should be.
http://cvs.php.net/diff.php/php-src/ext/tidy/tidy.c?r1=1.52&r2=1.53&ty=u
Index: php-src/ext/tidy/tidy.c
diff -u php-src/ext/tidy/tidy.c:1.52 php-src/ext/tidy/tidy.c:1.53
--- php-src/ext/tidy/tidy.c:1.52 Sun May 23 13:22:21 2004
+++ php-src/ext/tidy/tidy.c Fri May 28 16:32:52 2004
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: tidy.c,v 1.52 2004/05/23 17:22:21 iliaa Exp $ */
+/* $Id: tidy.c,v 1.53 2004/05/28 20:32:52 john Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -93,13 +93,13 @@
} \
}
-#define REGISTER_TIDY_CLASS(classname, name, parent) \
+#define REGISTER_TIDY_CLASS(classname, name, parent, __flags) \
{ \
zend_class_entry ce; \
INIT_CLASS_ENTRY(ce, # classname, tidy_funcs_ ## name); \
ce.create_object = tidy_object_new_ ## name; \
tidy_ce_ ## name = zend_register_internal_class_ex(&ce, parent, NULL
TSRMLS_CC); \
- tidy_ce_ ## name->ce_flags |= ZEND_ACC_FINAL_CLASS; \
+ tidy_ce_ ## name->ce_flags |= __flags; \
memcpy(&tidy_object_handlers_ ## name, zend_get_std_object_handlers(),
sizeof(zend_object_handlers)); \
tidy_object_handlers_ ## name.clone_obj = NULL; \
}
@@ -895,8 +895,8 @@
ZEND_INIT_MODULE_GLOBALS(tidy, tidy_globals_ctor, tidy_globals_dtor);
REGISTER_INI_ENTRIES();
- REGISTER_TIDY_CLASS(tidy, doc, NULL);
- REGISTER_TIDY_CLASS(tidyNode, node, NULL);
+ REGISTER_TIDY_CLASS(tidy, doc, NULL, 0);
+ REGISTER_TIDY_CLASS(tidyNode, node, NULL, ZEND_ACC_FINAL_CLASS);
/* no exceptions for now..
REGISTER_TIDY_CLASS(tidyException, exception, zend_exception_get_default());
*/
@@ -939,7 +939,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.52 2004/05/23 17:22:21 iliaa Exp $)");
+ php_info_print_table_row(2, "Extension Version", PHP_TIDY_MODULE_VERSION "
($Id: tidy.c,v 1.53 2004/05/28 20:32:52 john Exp $)");
php_info_print_table_end();
DISPLAY_INI_ENTRIES();
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
