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/spl/php_spl.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/spl/php_spl.c')
| -rw-r--r-- | ext/spl/php_spl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/spl/php_spl.c b/ext/spl/php_spl.c index 20911c8df6..f9a642410f 100644 --- a/ext/spl/php_spl.c +++ b/ext/spl/php_spl.c @@ -315,7 +315,7 @@ PHP_FUNCTION(spl_autoload) RETURN_FALSE; } - if (file_exts == NULL) { /* autoload_extensions is not initialzed, set to defaults */ + if (file_exts == NULL) { /* autoload_extensions is not initialized, set to defaults */ pos = SPL_DEFAULT_FILE_EXTENSIONS; pos_len = sizeof(SPL_DEFAULT_FILE_EXTENSIONS) - 1; } else { |