diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2012-12-05 09:34:12 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2012-12-05 09:34:12 +0100 |
| commit | 40343006a97a5592ebfb027ce6828ca64e877d4e (patch) | |
| tree | daa47cd502faaed29f7004360536772a0fa2dddb /phpBB/includes | |
| parent | d9f554fe0349b3b476813c393c93e6da650e10c2 (diff) | |
| parent | a8d02ffc27d8cee916f267c91488276fca3606e7 (diff) | |
| download | forums-40343006a97a5592ebfb027ce6828ca64e877d4e.tar forums-40343006a97a5592ebfb027ce6828ca64e877d4e.tar.gz forums-40343006a97a5592ebfb027ce6828ca64e877d4e.tar.bz2 forums-40343006a97a5592ebfb027ce6828ca64e877d4e.tar.xz forums-40343006a97a5592ebfb027ce6828ca64e877d4e.zip | |
Merge remote-tracking branch 'p/ticket/11247' into develop
* p/ticket/11247:
[ticket/11247] Fix wrong property reference in flock class.
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/lock/flock.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/lock/flock.php b/phpBB/includes/lock/flock.php index 5c2288ce1b..97bc7dd2b9 100644 --- a/phpBB/includes/lock/flock.php +++ b/phpBB/includes/lock/flock.php @@ -67,7 +67,7 @@ class phpbb_lock_flock */ public function acquire() { - if ($this->locked) + if ($this->lock_fp) { return false; } |