diff options
| author | Lior Kaplan <kaplanlior@gmail.com> | 2014-08-17 21:37:22 +0300 |
|---|---|---|
| committer | Lior Kaplan <kaplanlior@gmail.com> | 2014-08-17 21:37:22 +0300 |
| commit | 741605da73d424a3cb2fe29d2d5a610b010d0aff (patch) | |
| tree | efcbc0651b3ac19de488217b7fc5b756880bb71f /ext/mbstring/mb_gpc.c | |
| parent | 1e3452992fac7536d30a92955b20b8af038f1ef7 (diff) | |
| parent | f1d0e50ea8915a18ab5bf24402b787c35552e162 (diff) | |
| download | php-git-741605da73d424a3cb2fe29d2d5a610b010d0aff.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
Correct typo in comments: 'initialized'
Conflicts:
ext/dom/php_dom.c
ext/spl/php_spl.c
Diffstat (limited to 'ext/mbstring/mb_gpc.c')
| -rw-r--r-- | ext/mbstring/mb_gpc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/mbstring/mb_gpc.c b/ext/mbstring/mb_gpc.c index a2dd62da53..a0aab076a5 100644 --- a/ext/mbstring/mb_gpc.c +++ b/ext/mbstring/mb_gpc.c @@ -258,7 +258,7 @@ const mbfl_encoding *_php_mb_encoding_handler_ex(const php_mb_encoding_handler_i goto out; } - num = n; /* make sure to process initilized vars only */ + num = n; /* make sure to process initialized vars only */ /* initialize converter */ if (info->num_from_encodings <= 0) { |