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

Add cache activation to configuration (closes #345)

Browse Source
This commit is contained in:
onli 2016-01-15 14:40:51 +01:00
parent 148e644590
commit 2d7947eb93
4 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/functions_entries.inc.php
View File

@ -207,7 +207,7 @@ 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) { 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; global $serendipity;
if ($serendipity['use_internal_cache']) { if ($serendipity['useInternalCache']) {
$cache = serendipity_setupCache(); $cache = serendipity_setupCache();
$args = func_get_args(); $args = func_get_args();
@ -460,7 +460,7 @@ function &serendipity_fetchEntries($range = null, $full = true, $limit = '', $fe
serendipity_fetchEntryData($ret); serendipity_fetchEntryData($ret);
} }
if ($serendipity['use_internal_cache']) { if ($serendipity['useInternalCache']) {
$args = func_get_args(); $args = func_get_args();
$args = array_values($args); $args = array_values($args);
$key = md5(serialize($args)); $key = md5(serialize($args));
@ -1254,7 +1254,7 @@ function serendipity_printEntries($entries, $extended = 0, $preview = false, $sm
$serendipity['smarty']->assignByRef('entries', $dategroup); $serendipity['smarty']->assignByRef('entries', $dategroup);
if ($serendipity['use_internal_cache']) { if ($serendipity['useInternalCache']) {
$cache = serendipity_setupCache(); $cache = serendipity_setupCache();
$args = func_get_args(); $args = func_get_args();

2
include/genpage.inc.php
View File

@ -122,7 +122,7 @@ switch ($serendipity['GET']['action']) {
// Welcome screen or whatever // Welcome screen or whatever
default: default:
if ($serendipity['use_internal_cache']) { if ($serendipity['useInternalCache']) {
$entries = serendipity_fetchEntries(null, true, $serendipity['fetchLimit']); $entries = serendipity_fetchEntries(null, true, $serendipity['fetchLimit']);
if (! serendipity_printEntriesCached($entries)) { if (! serendipity_printEntriesCached($entries)) {
serendipity_printEntries($entries); serendipity_printEntries($entries);

7
include/tpl/config_local.inc.php
View File

@ -412,6 +412,13 @@
'type' => 'list', 'type' => 'list',
'default' => array('Off' => NO, 'error' => ERROR, 'debug' => DEBUG), 'default' => array('Off' => NO, 'error' => ERROR, 'debug' => DEBUG),
'permission' => 'blogConfiguration'), 'permission' => 'blogConfiguration'),
array('var' => 'useInternalCache',
'title' => USE_CACHE,
'description' => USE_CACHE_DESC,
'type' => 'bool',
'default' => false,
'permission' => 'siteConfiguration'),
)); ));
$res['display'] = $res['display'] =

4
serendipity_config.inc.php
View File

@ -450,8 +450,8 @@ if (defined('IN_serendipity_admin') && !isset($serendipity['use_autosave'])) {
$serendipity['use_autosave'] = true; $serendipity['use_autosave'] = true;
} }
if (!isset($serendipity['use_internal_cache'])) { if (!isset($serendipity['useInternalCache'])) {
$serendipity['use_internal_cache'] = false; $serendipity['useInternalCache'] = false;
} }
// You can set parameters which ImageMagick should use to generate the thumbnails // You can set parameters which ImageMagick should use to generate the thumbnails