diff options
| author | Rasmus Lerdorf <rasmus@php.net> | 2012-05-13 11:48:25 -0700 |
|---|---|---|
| committer | Rasmus Lerdorf <rasmus@php.net> | 2012-05-13 11:48:25 -0700 |
| commit | 8da61c62d931bb76faba55bb2fcbd1938b2f96fc (patch) | |
| tree | 3bef58b2c13fcbd3277cff8ba012447943c36e79 | |
| parent | 5852e5f48d7b013108b98b9c57c18383765d21ea (diff) | |
| parent | cd16174f14a93b89f064108d72b4fb612345de8f (diff) | |
| download | php-git-8da61c62d931bb76faba55bb2fcbd1938b2f96fc.tar.gz | |
Merge branch 'PHP-5.4'
* PHP-5.4:
Fix grammo
| -rw-r--r-- | ext/standard/filestat.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/standard/filestat.c b/ext/standard/filestat.c index 142ca9bdcf..4e5f768381 100644 --- a/ext/standard/filestat.c +++ b/ext/standard/filestat.c @@ -803,7 +803,7 @@ PHP_FUNCTION(touch) PHPAPI void php_clear_stat_cache(zend_bool clear_realpath_cache, const char *filename, int filename_len TSRMLS_DC) { /* always clear CurrentStatFile and CurrentLStatFile even if filename is not NULL - * as it may contains outdated data (e.g. "nlink" for a directory when deleting a file + * as it may contain outdated data (e.g. "nlink" for a directory when deleting a file * in this directory, as shown by lstat_stat_variation9.phpt) */ if (BG(CurrentStatFile)) { efree(BG(CurrentStatFile)); |