diff options
| author | Joe Watkins <krakjoe@php.net> | 2016-04-28 15:52:45 +0100 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2016-04-28 15:52:45 +0100 |
| commit | c07069495be251317a65fb49f914651961996f84 (patch) | |
| tree | 89d769a3121780297d79e57f4bb25e861fc6c8ef | |
| parent | c2ef11e86f8715bc01e69e4c71e63103c7b1dc79 (diff) | |
| parent | 2787a24f86d9b73f0fee40e4104b567113ee8e6b (diff) | |
| download | php-git-c07069495be251317a65fb49f914651961996f84.tar.gz | |
Merge branch 'PHP-7.0'
* PHP-7.0:
simplify expression
| -rw-r--r-- | main/fopen_wrappers.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/fopen_wrappers.c b/main/fopen_wrappers.c index ab51e5e58b..c3646ee0fd 100644 --- a/main/fopen_wrappers.c +++ b/main/fopen_wrappers.c @@ -647,7 +647,7 @@ PHPAPI FILE *php_fopen_with_path(const char *filename, const char *mode, const c if ((*filename == '.') /* Absolute path open */ || IS_ABSOLUTE_PATH(filename, filename_length) - || (!path || (path && !*path)) + || (!path || !*path) ) { return php_fopen_and_set_opened_path(filename, mode, opened_path); } |