Merge pull request #3320 from Hypolite/issue/#3292

[friendica.git] / include / lock.php

diff --git a/include/lock.php b/include/lock.php
index 70cf4b787b439dbf25c5c135965cd0b3b4bfad24..a48b0ad342e1353b1b3b816e50bf0d5fc4c4cffb 100644 (file)
--- a/include/lock.php
+++ b/include/lock.php
@@ -16,14 +16,15 @@ function lock_function($fn_name, $block = true, $wait_sec = 2, $timeout = 30) {
                        dbesc($fn_name)
                );
 
-               if((count($r)) AND (!$r[0]['locked'] OR (strtotime($r[0]['created']) < time() - 3600))) {
+               if((dbm::is_result($r)) AND (!$r[0]['locked'] OR (strtotime($r[0]['created']) < time() - 3600))) {
                        q("UPDATE `locks` SET `locked` = 1, `created` = '%s' WHERE `name` = '%s'",
                                dbesc(datetime_convert()),
                                dbesc($fn_name)
                        );
                        $got_lock = true;
                }
-               elseif(! $r) { // the Boolean value for count($r) should be equivalent to the Boolean value of $r
+               elseif (! dbm::is_result($r)) {
+                       /// @TODO the Boolean value for count($r) should be equivalent to the Boolean value of $r
                        q("INSERT INTO `locks` (`name`, `created`, `locked`) VALUES ('%s', '%s', 1)",
                                dbesc($fn_name),
                                dbesc(datetime_convert())
@@ -56,10 +57,10 @@ function block_on_function_lock($fn_name, $wait_sec = 2, $timeout = 30) {
                                dbesc($fn_name)
                     );
 
-               if(count($r) && $r[0]['locked'])
+               if (dbm::is_result($r) && $r[0]['locked'])
                        sleep($wait_sec);
 
-       } while(count($r) && $r[0]['locked'] && ((time() - $start) < $timeout));
+       } while(dbm::is_result($r) && $r[0]['locked'] && ((time() - $start) < $timeout));
 
        return;
 }}
@@ -67,7 +68,8 @@ function block_on_function_lock($fn_name, $wait_sec = 2, $timeout = 30) {
 
 if(! function_exists('unlock_function')) {
 function unlock_function($fn_name) {
-       $r = q("UPDATE `locks` SET `locked` = 0, `created` = '0000-00-00 00:00:00' WHERE `name` = '%s'",
+       $r = q("UPDATE `locks` SET `locked` = 0, `created` = '%s' WHERE `name` = '%s'",
+                       dbesc(NULL_DATE),
                        dbesc($fn_name)
             );