Merge remote-tracking branch 'p/ticket/11247' into develop

* p/ticket/11247:
  [ticket/11247] Fix wrong property reference in flock class.
This commit is contained in:
Andreas Fischer 2012-12-05 09:34:12 +01:00
commit 40343006a9

View file

@ -67,7 +67,7 @@ class phpbb_lock_flock
*/
public function acquire()
{
if ($this->locked)
if ($this->lock_fp)
{
return false;
}