mbirth/LuckyCoinkydink
Archived
1
0
Fork 0
Code Issues Pull Requests Activity

Fix cache by getting & setting global state variables

Browse Source 
See https://board.s9y.org/viewtopic.php?p=10447129#p10447129. Missed in #345
This commit is contained in:
onli
2017-04-19 01:11:34 +02:00
parent b6b989440d
commit c8bbb35aac
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
include/functions_entries.inc.php
View File

@ -207,14 +207,15 @@ function &serendipity_fetchEntryCategories($entryid) {
function &serendipity_fetchEntries($range = null, $full = true, $limit = '', $fetchDrafts = false, $modified_since = false, $orderby = 'timestamp DESC', $filter_sql = '', $noCache = false, $noSticky = false, $select_key = null, $group_by = null, $returncode = 'array', $joinauthors = true, $joincategories = true, $joinown = null) {
global $serendipity;
$initial_args = array_values(func_get_args());
if ($serendipity['useInternalCache']) {
$cache = serendipity_setupCache();
$args = func_get_args();
$args = array_values($args);
$key = md5(serialize($args));
if (($entries = $cache->get($key, "fetchEntries")) !== false) {
$key = md5(serialize($initial_args) . $serendipity['GET']['page']);
$entries = $cache->get($key, "fetchEntries");
if ($entries !== false) {
$serendipity['fullCountQuery'] = $cache->get($key . '_fullCountQuery', "fetchEntries");
return unserialize($entries);
}
}
@ -461,10 +462,9 @@ function &serendipity_fetchEntries($range = null, $full = true, $limit = '', $fe
}
if ($serendipity['useInternalCache']) {
$args = func_get_args();
$args = array_values($args);
$key = md5(serialize($args));
$key = md5(serialize($initial_args) . $serendipity['GET']['page']);
$cache->save(serialize($ret), $key, "fetchEntries");
$cache->save($serendipity['fullCountQuery'], $key . '_fullCountQuery', "fetchEntries");
}
return $ret;