Refs #2847. Fixed simplecache settings and functionality for initial installation.

git-svn-id: http://code.elgg.org/elgg/trunk@8278 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/engine/lib/cache.php b/engine/lib/cache.php
index 2832a35b91386158a0b81a026e2010c8f694faae..32f36ff03751b991024dac970aa711979b75034d 100644 (file)
--- a/engine/lib/cache.php
+++ b/engine/lib/cache.php
@@ -243,9 +243,7 @@ function elgg_regenerate_simplecache($viewtype = NULL) {
  * @since 1.8.0
  */
 function elgg_is_simplecache_enabled() {
-       global $CONFIG;
-
-       if ($CONFIG->simplecache_enabled) {
+       if (elgg_get_config('simplecache_enabled')) {
                return true;
        }
 

diff --git a/install/ElggInstaller.php b/install/ElggInstaller.php
index fc0eff0ab7f0c2e19ffd26f6d92df623cbd5bdc3..3fdd3afdb059b04a797fef4789e25d8b437fcea4 100644 (file)
--- a/install/ElggInstaller.php
+++ b/install/ElggInstaller.php
@@ -1303,6 +1303,7 @@ class ElggInstaller {
                datalist_set('dataroot', $submissionVars['dataroot']);
                datalist_set('default_site', $site->getGUID());
                datalist_set('version', get_version());
+               datalist_set('simplecache_enabled', 1);
 
                // new installations have run all the upgrades
                $upgrades = elgg_get_upgrade_files($submissionVars['path'] . 'engine/lib/upgrades/');
@@ -1320,6 +1321,8 @@ class ElggInstaller {
                $dataroot = datalist_get('dataroot');
                $cache = new ElggFileCache($dataroot);
                $cache->delete('view_paths');
+               elgg_invalidate_simplecache();
+               elgg_regenerate_simplecache();
 
                return TRUE;
        }