From: Hannes Magnusson Date: Fri, 30 Sep 2011 14:17:23 +0000 (+0000) Subject: Fixed bug #55807 (Wrong value for splFileObject::SKIP_EMPTY) X-Git-Tag: php-5.4.0beta2~53 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5fba3ba7c300e047d0b387e6d54024025a17b1c5;p=php Fixed bug #55807 (Wrong value for splFileObject::SKIP_EMPTY) --- diff --git a/NEWS b/NEWS index 8afdb8924c..39efbee170 100644 --- a/NEWS +++ b/NEWS @@ -20,6 +20,8 @@ PHP NEWS - SPL: . FilesystemIterator, GlobIterator and (Recursive)DirectoryIterator now use the default stream context. (Hannes) + . Fixed bug #55807 (Wrong value for splFileObject::SKIP_EMPTY). + (jgotti at modedemploi dot fr, Hannes) - CLI SAPI: . Fixed bug #55726 (Changing the working directory makes router script diff --git a/ext/spl/spl_directory.h b/ext/spl/spl_directory.h index d04ce3f9b3..58dd3a8d23 100755 --- a/ext/spl/spl_directory.h +++ b/ext/spl/spl_directory.h @@ -117,7 +117,7 @@ static inline spl_filesystem_object* spl_filesystem_iterator_to_object(spl_files #define SPL_FILE_OBJECT_DROP_NEW_LINE 0x00000001 /* drop new lines */ #define SPL_FILE_OBJECT_READ_AHEAD 0x00000002 /* read on rewind/next */ -#define SPL_FILE_OBJECT_SKIP_EMPTY 0x00000006 /* skip empty lines */ +#define SPL_FILE_OBJECT_SKIP_EMPTY 0x00000004 /* skip empty lines */ #define SPL_FILE_OBJECT_READ_CSV 0x00000008 /* read via fgetcsv */ #define SPL_FILE_OBJECT_MASK 0x0000000F /* read via fgetcsv */