--- embedaddon/php/ext/dom/documenttype.c 2012/05/29 12:34:37 1.1.1.2 +++ embedaddon/php/ext/dom/documenttype.c 2013/07/22 01:31:40 1.1.1.3 @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 5 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2012 The PHP Group | + | Copyright (c) 1997-2013 The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: documenttype.c,v 1.1.1.2 2012/05/29 12:34:37 misho Exp $ */ +/* $Id: documenttype.c,v 1.1.1.3 2013/07/22 01:31:40 misho Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -205,7 +205,11 @@ int dom_documenttype_internal_subset_read(dom_object * if (buff != NULL) { xmlNodeDumpOutput (buff, NULL, (xmlNodePtr) intsubset, 0, 0, NULL); xmlOutputBufferFlush(buff); +#ifdef LIBXML2_NEW_BUFFER + ZVAL_STRINGL(*retval, xmlOutputBufferGetContent(buff), xmlOutputBufferGetSize(buff), 1); +#else ZVAL_STRINGL(*retval, buff->buffer->content, buff->buffer->use, 1); +#endif (void)xmlOutputBufferClose(buff); return SUCCESS; }