Changeset 694 for trunk/lib

Timestamp:

Aug 8, 2019 9:58:42 PM (5 years ago)

Author:

anonymous

Message:

Fix cases when checking for current lock was missing

File:

• trunk/lib/Lock.inc.php (modified) (4 diffs)

trunk/lib/Lock.inc.php

@@ -185 +185 @@
      * @param string $record_key  The key column for the record to lock.
      * @param string $record_val  The value of the key column for the record to lock.
-     * @param string $title       A title to apply to the lock, for display purposes.
      */
     public function select($record_table_or_lock_id, $record_key=null, $record_val=null)
@@ -245 +244 @@
         $this->initDB();
 
-        if (isset($this->data['lock_id'])) {
+        if ($this->isLocked()) {
             $qid = $db->query("SELECT * FROM " . $db->escapeString($this->getParam('db_table')) . " WHERE lock_id = '" . $db->escapeString($this->data['lock_id']) . "'");
             if ($lock = mysql_fetch_assoc($qid)) {
@@ -328 +327 @@
         $this->_auto_timeout();
 
+        if (!$this->isLocked()) {
+            // No lock selected.
+            return false;
+        }
+
         // Delete a specific lock.
         $db->query("
@@ -335 +339 @@
 
         $app->logMsg(sprintf('Removing lock: %s', $this->data['lock_id']), LOG_DEBUG, __FILE__, __LINE__);
+        return true;
     }