diff options
| author | Dmitry Stogov <dmitry@php.net> | 2010-05-25 11:38:48 +0000 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@php.net> | 2010-05-25 11:38:48 +0000 |
| commit | 25893b643d0df47865836ec3fb787da5516bf8d2 (patch) | |
| tree | 8b604daab4caf8bdb913ee92aebebf0fde240dd6 /ext/tidy/tidy.c | |
| parent | f7ce69585c0809a40ff79ebc2d429720aadd4534 (diff) | |
| download | php-git-25893b643d0df47865836ec3fb787da5516bf8d2.tar.gz | |
Fixed compatibility with "Run Time Cache" patch
Diffstat (limited to 'ext/tidy/tidy.c')
| -rw-r--r-- | ext/tidy/tidy.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/ext/tidy/tidy.c b/ext/tidy/tidy.c index f48b4f5bf1..cc66e97627 100644 --- a/ext/tidy/tidy.c +++ b/ext/tidy/tidy.c @@ -828,6 +828,9 @@ static void tidy_doc_update_properties(PHPTidyObj *obj TSRMLS_DC) tidySaveBuffer (obj->ptdoc->doc, &output); if (output.size) { + if (!obj->std.properties) { + rebuild_object_properties(&obj->std); + } MAKE_STD_ZVAL(temp); ZVAL_STRINGL(temp, (char*)output.bp, output.size-1, TRUE); zend_hash_update(obj->std.properties, "value", sizeof("value"), (void *)&temp, sizeof(zval *), NULL); @@ -836,6 +839,9 @@ static void tidy_doc_update_properties(PHPTidyObj *obj TSRMLS_DC) tidyBufFree(&output); if (obj->ptdoc->errbuf->size) { + if (!obj->std.properties) { + rebuild_object_properties(&obj->std); + } MAKE_STD_ZVAL(temp); ZVAL_STRINGL(temp, (char*)obj->ptdoc->errbuf->bp, obj->ptdoc->errbuf->size-1, TRUE); zend_hash_update(obj->std.properties, "errorBuffer", sizeof("errorBuffer"), (void *)&temp, sizeof(zval *), NULL); @@ -854,6 +860,9 @@ static void tidy_add_default_properties(PHPTidyObj *obj, tidy_obj_type type TSRM switch(type) { case is_node: + if (!obj->std.properties) { + rebuild_object_properties(&obj->std); + } tidyBufInit(&buf); tidyNodeGetText(obj->ptdoc->doc, obj->node, &buf); ADD_PROPERTY_STRINGL(obj->std.properties, value, buf.bp, buf.size-1); @@ -923,6 +932,9 @@ static void tidy_add_default_properties(PHPTidyObj *obj, tidy_obj_type type TSRM break; case is_doc: + if (!obj->std.properties) { + rebuild_object_properties(&obj->std); + } ADD_PROPERTY_NULL(obj->std.properties, errorBuffer); ADD_PROPERTY_NULL(obj->std.properties, value); break; |