From 2d7947eb9354bcc9fdb5b445698717321b8a0be7 Mon Sep 17 00:00:00 2001
From: onli <onli89@googlemail.com>
Date: Fri, 15 Jan 2016 14:40:51 +0100
Subject: [PATCH] Add cache activation to configuration (closes #345)

---
 include/functions_entries.inc.php | 6 +++---
 include/genpage.inc.php           | 2 +-
 include/tpl/config_local.inc.php  | 7 +++++++
 serendipity_config.inc.php        | 4 ++--
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/include/functions_entries.inc.php b/include/functions_entries.inc.php
index 644625fe..d7364bb7 100644
--- a/include/functions_entries.inc.php
+++ b/include/functions_entries.inc.php
@@ -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) {
     global $serendipity;
 
-    if ($serendipity['use_internal_cache']) {
+    if ($serendipity['useInternalCache']) {
         $cache = serendipity_setupCache();
 
         $args = func_get_args();
@@ -460,7 +460,7 @@ function &serendipity_fetchEntries($range = null, $full = true, $limit = '', $fe
         serendipity_fetchEntryData($ret);
     }
 
-    if ($serendipity['use_internal_cache']) {
+    if ($serendipity['useInternalCache']) {
         $args = func_get_args();
         $args = array_values($args);
         $key = md5(serialize($args));
@@ -1254,7 +1254,7 @@ function serendipity_printEntries($entries, $extended = 0, $preview = false, $sm
 
     $serendipity['smarty']->assignByRef('entries', $dategroup);
 
-    if ($serendipity['use_internal_cache']) {
+    if ($serendipity['useInternalCache']) {
         $cache = serendipity_setupCache();
 
         $args = func_get_args();
diff --git a/include/genpage.inc.php b/include/genpage.inc.php
index 2bcbeb66..1c3e6043 100644
--- a/include/genpage.inc.php
+++ b/include/genpage.inc.php
@@ -122,7 +122,7 @@ switch ($serendipity['GET']['action']) {
 
     // Welcome screen or whatever
     default:
-        if ($serendipity['use_internal_cache']) {
+        if ($serendipity['useInternalCache']) {
             $entries = serendipity_fetchEntries(null, true, $serendipity['fetchLimit']);
             if (! serendipity_printEntriesCached($entries)) {
                 serendipity_printEntries($entries);
diff --git a/include/tpl/config_local.inc.php b/include/tpl/config_local.inc.php
index eb67a11b..07bcdda2 100644
--- a/include/tpl/config_local.inc.php
+++ b/include/tpl/config_local.inc.php
@@ -412,6 +412,13 @@
                                           'type'        => 'list',
                                           'default'     => array('Off' => NO, 'error' => ERROR, 'debug' => DEBUG),
                                           'permission'  => 'blogConfiguration'),
+
+                                    array('var'         => 'useInternalCache',
+                                          'title'       => USE_CACHE,
+                                          'description' => USE_CACHE_DESC,
+                                          'type'        => 'bool',
+                                          'default'     => false,
+                                          'permission'  => 'siteConfiguration'),
                             ));
 
     $res['display'] =
diff --git a/serendipity_config.inc.php b/serendipity_config.inc.php
index 4a7b624f..2ce82a4a 100644
--- a/serendipity_config.inc.php
+++ b/serendipity_config.inc.php
@@ -450,8 +450,8 @@ if (defined('IN_serendipity_admin') && !isset($serendipity['use_autosave'])) {
     $serendipity['use_autosave'] = true;
 }
 
-if (!isset($serendipity['use_internal_cache'])) {
-    $serendipity['use_internal_cache'] = false;
+if (!isset($serendipity['useInternalCache'])) {
+    $serendipity['useInternalCache'] = false;
 }
 
 // You can set parameters which ImageMagick should use to generate the thumbnails