summaryrefslogtreecommitdiff
path: root/main/streams/plain_wrapper.c
diff options
context:
space:
mode:
authorJakub Zelenka <bukka@php.net>2016-05-03 19:55:41 +0100
committerJakub Zelenka <bukka@php.net>2016-05-03 19:55:41 +0100
commit34a9882ad357620ccec2bfadba72fce027acd3d6 (patch)
treed531877fdae8ec4126e8042ca350dcfcdb8b770f /main/streams/plain_wrapper.c
parent93b67dd511fdf890931e2b18846886368798ca5a (diff)
parentee551106bc11d6ac2eb277b810c9b8bb90e318bc (diff)
downloadphp-git-34a9882ad357620ccec2bfadba72fce027acd3d6.tar.gz
Merge branch 'master' into json_parser_method
Diffstat (limited to 'main/streams/plain_wrapper.c')
-rw-r--r--main/streams/plain_wrapper.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/main/streams/plain_wrapper.c b/main/streams/plain_wrapper.c
index 8c9a888845..d510c909a7 100644
--- a/main/streams/plain_wrapper.c
+++ b/main/streams/plain_wrapper.c
@@ -1484,7 +1484,7 @@ not_relative_path:
}
#endif
- if (!path || (path && !*path)) {
+ if (!path || !*path) {
return php_stream_fopen_rel(filename, mode, opened_path, options);
}