From: Lior Kaplan <kaplanlior@gmail.com>
Date: Wed, 1 Apr 2015 15:30:55 +0000 (+0300)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHP7_NSAPI_REMOVAL~418
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3b8b1435ad832e162a2a3a2009a548e833ebb99a;p=php

Merge branch 'PHP-5.6'

* PHP-5.6:
  Fix typo: unitialized -> uninitialized
  Fix typo: unitialized -> uninitialized

Conflicts:
	ext/xmlwriter/php_xmlwriter.c
---

3b8b1435ad832e162a2a3a2009a548e833ebb99a
diff --cc ext/xmlwriter/php_xmlwriter.c
index 122ed0c31e,6b5c3557a4..3cab7a1458
--- 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; \
  		} \
  	}