Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  fix BC break introduced by #2346 (sebastianbergmann/phpunit#2454)
This commit is contained in:
Joe Watkins 2017-01-30 11:26:37 +00:00
commit e6bc4f39a2
No known key found for this signature in database
GPG key ID: F9BA0ADA31CBD89E
2 changed files with 36 additions and 0 deletions

View file

@ -1628,6 +1628,9 @@ PHP_FUNCTION(dom_document_savexml)
doc_props = dom_get_doc_props(intern->document);
format = doc_props->formatoutput;
if (format) {
options = options | XML_SAVE_FORMAT;
}
buf = xmlBufferCreate();
if (!buf) {