diff options
| author | Jakub Zelenka <bukka@php.net> | 2015-01-12 09:02:17 +0000 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2015-01-12 09:02:17 +0000 |
| commit | b3823f5cab4e405b767cd8dddebb54b1c29bd2a8 (patch) | |
| tree | e42fbf615d62213c1e744b8a909155e8f2cdaa87 /ext/session/mod_user.c | |
| parent | e6fb493e5dbafdad37ba5334c986636342b5d9aa (diff) | |
| parent | 31817447cc06093368f022086340ad3f6f616528 (diff) | |
| download | php-git-b3823f5cab4e405b767cd8dddebb54b1c29bd2a8.tar.gz | |
Merge branch 'master' into jsond
Conflicts:
ext/json/JSON_parser.c
ext/json/JSON_parser.h
ext/json/json.c
ext/json/utf8_decode.c
Diffstat (limited to 'ext/session/mod_user.c')
| -rw-r--r-- | ext/session/mod_user.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/session/mod_user.c b/ext/session/mod_user.c index 0e6e00eb32..dc443d382a 100644 --- a/ext/session/mod_user.c +++ b/ext/session/mod_user.c @@ -1,4 +1,4 @@ -/* +/* +----------------------------------------------------------------------+ | PHP Version 7 | +----------------------------------------------------------------------+ @@ -94,11 +94,11 @@ PS_OPEN_FUNC(user) { zval args[2]; STDVARS; - + if (Z_ISUNDEF(PSF(open))) { php_error_docref(NULL, E_WARNING, "user session functions not defined"); - + return FAILURE; } |