diff options
author | Christoph M. Becker <cmbecker69@gmx.de> | 2016-08-18 17:56:16 +0200 |
---|---|---|
committer | Christoph M. Becker <cmbecker69@gmx.de> | 2016-08-18 17:56:16 +0200 |
commit | caf0ad403d8b508f86227915842ffae43bbe2a73 (patch) | |
tree | 340f9a65b9515c656aae8e95ff65479a95d4ec6a /ext/dba | |
parent | e6d322176694f28f48802521a95e2d5f9997afc5 (diff) | |
parent | bc1214f25e7c9525336b34e09aec1f1db82b9894 (diff) | |
download | php-git-caf0ad403d8b508f86227915842ffae43bbe2a73.tar.gz |
Merge branch 'PHP-5.6' into PHP-7.0
Diffstat (limited to 'ext/dba')
-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"; |