com php-src: Fix wrong merge: ext/dom/document.c

From: Date: Wed, 10 Jun 2015 12:15:14 +0000
Subject: com php-src: Fix wrong merge: ext/dom/document.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-87185@lists.php.net to get a copy of this message
Commit: 2fad2b252ee8ae9e105cf7b13dd3feaf64fba73b Author: Julien Pauli <jpauli@php.net> Wed, 10 Jun 2015 14:15:14 +0200 Parents: bf72e139010bc308fceb6efbc0ee3b104f1312db Branches: PHP-5.5.26 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=2fad2b252ee8ae9e105cf7b13dd3feaf64fba73b Log: Fix wrong merge Changed paths: M ext/dom/document.c Diff: diff --git a/ext/dom/document.c b/ext/dom/document.c index a66450d..d82ca92 100644 --- a/ext/dom/document.c +++ b/ext/dom/document.c @@ -1991,7 +1991,7 @@ static void _dom_document_schema_validate(INTERNAL_FUNCTION_PARAMETERS, int type int is_valid; char resolved_path[MAXPATHLEN + 1]; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Op|l", &id, dom_document_class_entry, &source, &source_len, &flags) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os|l", &id, dom_document_class_entry, &source, &source_len, &flags) == FAILURE) { return; }

« previous php.cvs (#87185) next »