Skip to content

Commit

Permalink
Sync with Joomla PR joomla#11565
Browse files Browse the repository at this point in the history
  • Loading branch information
Tomasz Narloch committed Aug 12, 2016
1 parent 8e157ed commit fca82d0
Showing 1 changed file with 5 additions and 7 deletions.
12 changes: 5 additions & 7 deletions libraries/joomla/cache/storage/memcache.php
Original file line number Diff line number Diff line change
Expand Up @@ -347,13 +347,12 @@ public function remove($id, $group)
if (isset($index2[$cache_id_sfx]))
{
unset($index2[$cache_id_sfx]);
static::$_db->replace($index2key, $index2, 0, 0);
static::$_db->set($index2key, $index2, 0, 0);
}

$result = static::$_db->delete($cache_id);
$this->unlockindex($group_key);

return $result;
return static::$_db->delete($cache_id);
}

/**
Expand Down Expand Up @@ -399,7 +398,7 @@ public function clean($group, $mode = null)
unset($index2[$cache_id_sfx]);
}

static::$_db->replace($index2key, $index2, 0, 0);
static::$_db->set($index2key, $index2, 0, 0);
$this->unlockindex($group_key);
}

Expand Down Expand Up @@ -458,7 +457,7 @@ public function gc()
}
}

static::$_db->replace($index2key, $index2, 0, 0);
static::$_db->set($index2key, $index2, 0, 0);
$total_index2++;
}

Expand Down Expand Up @@ -523,8 +522,6 @@ public function lock($id, $group, $locktime)
{
if ($lock_counter > $looptime)
{
$returning->locked = false;
$returning->locklooped = true;
break;
}

Expand All @@ -535,6 +532,7 @@ public function lock($id, $group, $locktime)

$returning->locklooped = true;
}

$returning->locked = $data_lock;

return $returning;
Expand Down

0 comments on commit fca82d0

Please sign in to comment.