diff options
| author | justauser <[email protected]> | 2013-05-28 11:39:58 -0400 |
|---|---|---|
| committer | justauser <[email protected]> | 2013-05-28 11:39:58 -0400 |
| commit | 991418fa566ff462d9616123168c5f7f839cdc15 (patch) | |
| tree | 806d31367dbf0833511deafb1b73f88f892ad9cb /include/functions.php | |
| parent | 2e937560dfada30b398760308ce11f08c205d468 (diff) | |
| parent | 1d7658969352ee73dd94baf3cea15364dd303786 (diff) | |
Merge branch 'master' into jremote
update working to master
Diffstat (limited to 'include/functions.php')
| -rw-r--r-- | include/functions.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/functions.php b/include/functions.php index 7db040d04..01ffa751f 100644 --- a/include/functions.php +++ b/include/functions.php @@ -961,7 +961,7 @@ } function file_is_locked($filename) { - if (function_exists('flock')) { + if (function_exists('flock') && file_exists(LOCK_DIRECTORY . "/$filename")) { $fp = @fopen(LOCK_DIRECTORY . "/$filename", "r"); if ($fp) { if (flock($fp, LOCK_EX | LOCK_NB)) { |