diff options
| author | Felipe Pena <felipe@php.net> | 2009-03-26 20:02:53 +0000 |
|---|---|---|
| committer | Felipe Pena <felipe@php.net> | 2009-03-26 20:02:53 +0000 |
| commit | 8ecf8ede1ff9cd425cf1cfd754558ff4bd2d38f4 (patch) | |
| tree | 8d447a97971dd7d300621a52f491906cb1e7d576 /main/streams/streams.c | |
| parent | 5d8cf0217f3a45d297f63f726774fb94b7f1353d (diff) | |
| download | php-git-8ecf8ede1ff9cd425cf1cfd754558ff4bd2d38f4.tar.gz | |
- Removed:
- UG(unicode) checks
- pcre_cache_entry.unicode_mode
- Changed:
- ZEND_STR_TYPE -> IS_UNICODE
- convert_to_text -> convert_to_unicode
- convert_to_text_ex -> convert_to_unicode_ex
(Felipe, Steph)
Diffstat (limited to 'main/streams/streams.c')
| -rwxr-xr-x | main/streams/streams.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/streams/streams.c b/main/streams/streams.c index 0724eea312..490242429d 100755 --- a/main/streams/streams.c +++ b/main/streams/streams.c @@ -2358,7 +2358,7 @@ PHPAPI php_stream_dirent *_php_stream_readdir(php_stream *dirstream, php_stream_ PHPAPI void php_stream_fix_encoding(php_stream *stream, const char *mode, php_stream_context *context TSRMLS_DC) { /* Output encoding on text mode streams defaults to utf8 unless specified in context parameter */ - if (stream && strchr(mode, 't') && UG(unicode)) { + if (stream && strchr(mode, 't')) { /* Only apply implicit unicode.to. filter if the wrapper didn't do it for us */ if ((php_stream_filter_product(&stream->writefilters, IS_UNICODE) == IS_UNICODE) && (strchr(mode, 'w') || strchr(mode, 'a') || strchr(mode, '+'))) { |