Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

#718636 by mfb: Fixed Cache returns serialized data only in certain conditions.

merge-requests/26/head
Angie Byron 2010-03-07 07:26:13 +00:00
parent 3ae281d032
commit 58f1f75e07
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
includes/cache.inc
View File

@ -387,13 +387,6 @@ class DrupalDatabaseCache implements DrupalCacheInterface {
if (!isset($cache->data)) { if (!isset($cache->data)) {
return FALSE; return FALSE;
} }
// If the data is permanent or we are not enforcing a minimum cache lifetime
// always return the cached data.
if ($cache->expire == CACHE_PERMANENT || !variable_get('cache_lifetime', 0)) {
if ($cache->serialized) {
$cache->data = unserialize($cache->data);
}
}
// If enforcing a minimum cache lifetime, validate that the data is // If enforcing a minimum cache lifetime, validate that the data is
// currently valid for this user before we return it by making sure the cache // currently valid for this user before we return it by making sure the cache
// entry was created before the timestamp in the current session's cache // entry was created before the timestamp in the current session's cache
@ -405,6 +398,9 @@ class DrupalDatabaseCache implements DrupalCacheInterface {
return FALSE; return FALSE;
} }
if ($cache->serialized) {
$cache->data = unserialize($cache->data);
}
if (isset($cache->headers)) { if (isset($cache->headers)) {
$cache->headers = unserialize($cache->headers); $cache->headers = unserialize($cache->headers);
} }