diff options
| author | Lior Kaplan <kaplanlior@gmail.com> | 2015-04-01 18:30:55 +0300 |
|---|---|---|
| committer | Lior Kaplan <kaplanlior@gmail.com> | 2015-04-01 18:30:55 +0300 |
| commit | 3b8b1435ad832e162a2a3a2009a548e833ebb99a (patch) | |
| tree | cf0c471ebc65ad89bf14c7d643d3bc70b47a6d8b /ext/xmlwriter/php_xmlwriter.c | |
| parent | 780a8123fe11ef255b264b18b3482cc1a0810d61 (diff) | |
| parent | 3409d87eab47980246ddd9969cd2a61a2edacafb (diff) | |
| download | php-git-3b8b1435ad832e162a2a3a2009a548e833ebb99a.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
Fix typo: unitialized -> uninitialized
Fix typo: unitialized -> uninitialized
Conflicts:
ext/xmlwriter/php_xmlwriter.c
Diffstat (limited to 'ext/xmlwriter/php_xmlwriter.c')
| -rw-r--r-- | ext/xmlwriter/php_xmlwriter.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/xmlwriter/php_xmlwriter.c b/ext/xmlwriter/php_xmlwriter.c index 122ed0c31e..3cab7a1458 100644 --- a/ext/xmlwriter/php_xmlwriter.c +++ b/ext/xmlwriter/php_xmlwriter.c @@ -112,7 +112,7 @@ static void xmlwriter_free_resource_ptr(xmlwriter_object *intern) 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, E_WARNING, "Invalid or uninitialized XMLWriter object"); \ RETURN_FALSE; \ } \ } |