diff options
| author | Lior Kaplan <kaplanlior@gmail.com> | 2014-08-17 15:53:33 +0300 |
|---|---|---|
| committer | Lior Kaplan <kaplanlior@gmail.com> | 2014-08-17 15:53:33 +0300 |
| commit | 543d5eb4957b055319277263fc5219051e297359 (patch) | |
| tree | bfbfcc4c502d0860698b81082d519fc9d39cb3a2 /ext/spl/php_spl.c | |
| parent | 87afa6bdc9b310ebafec5d965734c4e467e27c6d (diff) | |
| parent | 56d02d564e946a03e397297d5d5ded112eefd928 (diff) | |
| download | php-git-543d5eb4957b055319277263fc5219051e297359.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
typofixes
Conflicts:
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 62cf6ae144..20911c8df6 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 intialzed, set to defaults */ + if (file_exts == NULL) { /* autoload_extensions is not initialzed, set to defaults */ pos = SPL_DEFAULT_FILE_EXTENSIONS; pos_len = sizeof(SPL_DEFAULT_FILE_EXTENSIONS) - 1; } else { |