com php-src: Merge branch 'PHP-5.6': ext/pcre/pcrelib/pcre_ex ec.c ext/xmlwriter/php_xmlwriter.c

From: Date: Wed, 01 Apr 2015 15:30:55 +0000
Subject: com php-src: Merge branch 'PHP-5.6': ext/pcre/pcrelib/pcre_ex ec.c ext/xmlwriter/php_xmlwriter.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-86028@lists.php.net to get a copy of this message
Commit: 3b8b1435ad832e162a2a3a2009a548e833ebb99a Author: Lior Kaplan <kaplanlior@gmail.com> Wed, 1 Apr 2015 18:30:55 +0300 Parents: 780a8123fe11ef255b264b18b3482cc1a0810d61 3409d87eab47980246ddd9969cd2a61a2edacafb Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=3b8b1435ad832e162a2a3a2009a548e833ebb99a Log: Merge branch 'PHP-5.6' * PHP-5.6: Fix typo: unitialized -> uninitialized Fix typo: unitialized -> uninitialized Conflicts: ext/xmlwriter/php_xmlwriter.c Changed paths: MM ext/pcre/pcrelib/pcre_exec.c MM ext/xmlwriter/php_xmlwriter.c Diff: diff --cc ext/xmlwriter/php_xmlwriter.c index 122ed0c,6b5c355..3cab7a1 --- a/ext/xmlwriter/php_xmlwriter.c +++ b/ext/xmlwriter/php_xmlwriter.c @@@ -109,10 -109,11 +109,10 @@@ static void xmlwriter_free_resource_ptr /* {{{ XMLWRITER_FROM_OBJECT */ #define XMLWRITER_FROM_OBJECT(intern, object) \ { \ - ze_xmlwriter_object *obj = (ze_xmlwriter_object*) zend_object_store_get_object(object TSRMLS_CC); \ + ze_xmlwriter_object *obj = Z_XMLWRITER_P(object); \ intern = obj->xmlwriter_ptr; \ if (!intern) { \ - php_error_docref(NULL, E_WARNING, "Invalid or unitialized XMLWriter object"); \ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid or uninitialized XMLWriter object"); \ ++ php_error_docref(NULL, E_WARNING, "Invalid or uninitialized XMLWriter object"); \ RETURN_FALSE; \ } \ }

« previous php.cvs (#86028) next »