Index: modules/block/block.module =================================================================== RCS file: /var/cvsroot/drupal/modules/block/block.module,v retrieving revision 1.1.1.1.2.1 retrieving revision 1.1.1.1.2.1.2.1 diff -u -p -r1.1.1.1.2.1 -r1.1.1.1.2.1.2.1 --- modules/block/block.module 25 Sep 2008 00:39:41 -0000 1.1.1.1.2.1 +++ modules/block/block.module 25 Sep 2008 00:41:25 -0000 1.1.1.1.2.1.2.1 @@ -1,5 +1,5 @@ uid. '::'. $theme_key; $cache = cache_get($cache_key, 'cache_advcache_block'); - $enabled_blocks = unserialize($cache->data); + $enabled_blocks = advcache_unserialize($cache->data); if (empty($enabled_blocks)) { $enabled_blocks = array(); $rids = array_keys($user->roles); @@ -673,7 +673,7 @@ function block_list($region) { $enabled_blocks[] = $block; } } - cache_set($cache_key, 'cache_advcache_block', serialize($enabled_blocks)); + cache_set($cache_key, 'cache_advcache_block', advcache_serialize($enabled_blocks)); } foreach ($enabled_blocks as $block) { Index: modules/comment/comment.module =================================================================== RCS file: /var/cvsroot/drupal/modules/comment/comment.module,v retrieving revision 1.1.1.1.2.1 retrieving revision 1.1.1.1.2.1.2.1 diff -u -p -r1.1.1.1.2.1 -r1.1.1.1.2.1.2.1 --- modules/comment/comment.module 25 Sep 2008 00:39:41 -0000 1.1.1.1.2.1 +++ modules/comment/comment.module 25 Sep 2008 00:41:25 -0000 1.1.1.1.2.1.2.1 @@ -1,5 +1,5 @@ data); + $comment = advcache_unserialize($cache->data); } if (!$comment) { @@ -989,7 +989,7 @@ function comment_render($node, $cid = 0) else { if ($cache_key) { if ($cache = cache_get($cache_key, 'cache_comment')) { - $comments = unserialize($cache->data); + $comments = advcache_unserialize($cache->data); $comment_count = count($comments); // Get the pager @@ -1055,7 +1055,7 @@ function comment_render($node, $cid = 0) $comment->depth = count(explode('.', $comment->thread)) - 1; $comments[] = $comment; } - cache_set($cache_key, 'cache_comment', serialize($comments)); + cache_set($cache_key, 'cache_comment', advcache_serialize($comments)); } foreach ($comments as $comment) { Index: modules/node/node.module =================================================================== RCS file: /var/cvsroot/drupal/modules/node/node.module,v retrieving revision 1.1.1.1.2.1 retrieving revision 1.1.1.1.2.1.2.1 diff -u -p -r1.1.1.1.2.1 -r1.1.1.1.2.1.2.1 --- modules/node/node.module 25 Sep 2008 00:39:41 -0000 1.1.1.1.2.1 +++ modules/node/node.module 25 Sep 2008 00:41:25 -0000 1.1.1.1.2.1.2.1 @@ -1,5 +1,5 @@ uid != 1) { $cache = cache_get($cache_id, 'cache_node'); if ($cache) { - $cache = unserialize($cache->data); + $cache = advcache_unserialize($cache->data); $nodes[$param] = is_object($cache) ? drupal_clone($cache) : $cache; return $nodes[$param]; } @@ -607,7 +607,7 @@ function node_load($param = array(), $re $nodes[$node->nid] = is_object($node) ? drupal_clone($node) : $node; if ($user->uid != 1) { if (!in_array($node->type, variable_get('advcache_node_exclude_types', array('poll')))) { - cache_set($cache_id, 'cache_node', serialize($nodes[$node->nid])); + cache_set($cache_id, 'cache_node', advcache_serialize($nodes[$node->nid])); } } } Index: modules/taxonomy/taxonomy.module =================================================================== RCS file: /var/cvsroot/drupal/modules/taxonomy/taxonomy.module,v retrieving revision 1.1.1.1.2.1 retrieving revision 1.1.1.1.2.1.2.1 diff -u -p -r1.1.1.1.2.1 -r1.1.1.1.2.1.2.1 --- modules/taxonomy/taxonomy.module 25 Sep 2008 00:39:41 -0000 1.1.1.1.2.1 +++ modules/taxonomy/taxonomy.module 25 Sep 2008 00:41:25 -0000 1.1.1.1.2.1.2.1 @@ -1,5 +1,5 @@ data); + $terms[$nid][$key] = advcache_unserialize($cache->data); } else { $result = db_query(db_rewrite_sql('SELECT t.* FROM {term_node} r INNER JOIN {term_data} t ON r.tid = t.tid INNER JOIN {vocabulary} v ON t.vid = v.vid WHERE r.nid = %d ORDER BY v.weight, t.weight, t.name', 't', 'tid'), $nid); @@ -795,7 +795,7 @@ function taxonomy_node_get_terms($nid, $ while ($term = db_fetch_object($result)) { $terms[$nid][$key][$term->$key] = $term; } - cache_set($cache_key, 'cache_taxonomy', serialize($terms[$nid][$key])); + cache_set($cache_key, 'cache_taxonomy', advcache_serialize($terms[$nid][$key])); } } @@ -1004,7 +1004,7 @@ function taxonomy_get_tree($vid, $parent static $children, $parents, $terms; if ((0 === $parent) && (-1 === $depth)) { if ($cache = cache_get('tree::'. $vid, 'cache_taxonomy')) { - return unserialize($cache->data); + return advcache_unserialize($cache->data); } else { $cache_tree = TRUE; @@ -1044,7 +1044,7 @@ function taxonomy_get_tree($vid, $parent } if ($cache_tree) { - cache_set('tree::'. $vid, 'cache_taxonomy', serialize($tree)); + cache_set('tree::'. $vid, 'cache_taxonomy', advcache_serialize($tree)); } return $tree ? $tree : array(); @@ -1171,7 +1171,7 @@ function taxonomy_get_vocabulary($vid) { if (!array_key_exists($vid, $vocabularies)) { if ($cache = cache_get('vocabulary::'. $vid, 'cache_taxonomy')) { - $vocabularies[$vid] = unserialize($cache->data); + $vocabularies[$vid] = advcache_unserialize($cache->data); } else { $result = db_query('SELECT v.*, n.type FROM {vocabulary} v LEFT JOIN {vocabulary_node_types} n ON v.vid = n.vid WHERE v.vid = %d ORDER BY v.weight, v.name', $vid); @@ -1181,7 +1181,7 @@ function taxonomy_get_vocabulary($vid) { unset($voc->type); $voc->nodes = $node_types; $vocabularies[$vid] = $voc; - cache_set('vocabulary::'. $vid, 'cache_taxonomy', serialize($voc)); + cache_set('vocabulary::'. $vid, 'cache_taxonomy', advcache_serialize($voc)); } } } @@ -1203,11 +1203,11 @@ function taxonomy_get_term($tid) { if (!isset($terms[$tid])) { if ($cache = cache_get('term::'. $tid, 'cache_taxonomy')) { - $terms[$tid] = unserialize($cache->data); + $terms[$tid] = advcache_unserialize($cache->data); } else { $terms[$tid] = db_fetch_object(db_query('SELECT * FROM {term_data} WHERE tid = %d', $tid)); - cache_set('term::'. $tid, 'cache_taxonomy', serialize($terms[$tid])); + cache_set('term::'. $tid, 'cache_taxonomy', advcache_serialize($terms[$tid])); } }