diff options
author | Christoph M. Becker <cmbecker69@gmx.de> | 2016-08-18 18:03:15 +0200 |
---|---|---|
committer | Christoph M. Becker <cmbecker69@gmx.de> | 2016-08-18 18:03:15 +0200 |
commit | cf40f999ba3a74acba1313cbf0a71c870de1ec8e (patch) | |
tree | e000a401894581a268164594f7b4c4a055d4b3cc | |
parent | 2a1d35ec6c47cc31bf5f3305c8059dad8b58c88e (diff) | |
parent | caf0ad403d8b508f86227915842ffae43bbe2a73 (diff) | |
download | php-git-cf40f999ba3a74acba1313cbf0a71c870de1ec8e.tar.gz |
Merge branch 'PHP-7.0' into PHP-7.1
-rw-r--r-- | ext/dba/tests/dba_handler.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/dba/tests/dba_handler.inc b/ext/dba/tests/dba_handler.inc index ed2a52400a..9792f00829 100644 --- a/ext/dba/tests/dba_handler.inc +++ b/ext/dba/tests/dba_handler.inc @@ -40,7 +40,7 @@ do { } if ($handler != 'cdb') { $db_writer = dba_open($db_filename, 'c'.$lock_flag, $handler); - if (($dba_reader = @dba_open($db_filename, 'r'.$lock_flag.($lock_flag ? 't' : ''), $handler))===false) { + if (($dba_reader = @dba_open($db_filename, 'r'.$lock_flag.'t', $handler))===false) { echo "Read during write: not allowed\n"; } else { echo "Read during write: allowed\n"; |