diff options
| author | Dhruv <dhruv.goel92@gmail.com> | 2013-06-13 22:00:12 +0530 |
|---|---|---|
| committer | Dhruv <dhruv.goel92@gmail.com> | 2013-06-13 22:00:12 +0530 |
| commit | e8b535bf9beda58ea8f75071ed31934534849cb1 (patch) | |
| tree | 36de3a5c8f46dda54d593593f71cb221cd9085ec /phpBB/includes/lock/flock.php | |
| parent | abd299b0a98be01499b31eb6901aca73d8c2b192 (diff) | |
| parent | 6298cce464ea2035c107549dfed9bfcb2f985f9c (diff) | |
| download | forums-e8b535bf9beda58ea8f75071ed31934534849cb1.tar forums-e8b535bf9beda58ea8f75071ed31934534849cb1.tar.gz forums-e8b535bf9beda58ea8f75071ed31934534849cb1.tar.bz2 forums-e8b535bf9beda58ea8f75071ed31934534849cb1.tar.xz forums-e8b535bf9beda58ea8f75071ed31934534849cb1.zip | |
Merge branch 'develop' into ticket/10820-develop
# By Joas Schilling (146) and others
# Via Andreas Fischer (50) and others
* develop: (356 commits)
[ticket/11599] Copy the forums into a static array for later reuse
[ticket/11602] Do not call localize_errors() if avatars are disabled
[ticket/11601] Add protected method for database sync and call it
[ticket/11601] Split post_setup_synchronisation logic from xml parsing
[ticket/11550] Specify a valid path so it's clearer that it must be a path
[ticket/11550] Move comments to correct function
[ticket/11550] We use a different fixture set for extension_acp_test.php
[ticket/11550] Fixtures should only be directories not files
[ticket/11550] Use new functionality from the test case helpers
[ticket/11550] Move functionality for copying/restoring to test case helpers
[ticket/11550] Fix copying the fixtures in extension_permission_lang_test.php
[ticket/11543] Add more users so #hidden <> #normal
[ticket/11590] Close database connections when tearDown() is called
[ticket/develop/11543] Use plurals in develop
[ticket/11543] Use correct IP addresses and inject time for correct values
[ticket/11543] Add unit tests for obtain_users_online_string()
[ticket/11543] Add unit tests for obtain_users_online() with empty forum
[ticket/11543] Add unit tests for obtain_users_online()
[ticket/11543] Add unit tests for obtain_guest_count()
[ticket/11481] Move prepended slash from calls into function
...
Diffstat (limited to 'phpBB/includes/lock/flock.php')
| -rw-r--r-- | phpBB/includes/lock/flock.php | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/phpBB/includes/lock/flock.php b/phpBB/includes/lock/flock.php index 97bc7dd2b9..17de0847c0 100644 --- a/phpBB/includes/lock/flock.php +++ b/phpBB/includes/lock/flock.php @@ -111,6 +111,17 @@ class phpbb_lock_flock } /** + * Does this process own the lock? + * + * @return bool true if lock is owned + * false otherwise + */ + public function owns_lock() + { + return (bool) $this->lock_fp; + } + + /** * Releases the lock. * * The lock must have been previously obtained, that is, acquire() call |