diff options
Diffstat (limited to 'application/config')
-rw-r--r-- | application/config/ConfigManager.php | 1 | ||||
-rw-r--r-- | application/config/ConfigPhp.php | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/application/config/ConfigManager.php b/application/config/ConfigManager.php index ca8918b5..a401887c 100644 --- a/application/config/ConfigManager.php +++ b/application/config/ConfigManager.php | |||
@@ -299,6 +299,7 @@ class ConfigManager | |||
299 | $this->setEmpty('resource.log', 'data/log.txt'); | 299 | $this->setEmpty('resource.log', 'data/log.txt'); |
300 | $this->setEmpty('resource.update_check', 'data/lastupdatecheck.txt'); | 300 | $this->setEmpty('resource.update_check', 'data/lastupdatecheck.txt'); |
301 | $this->setEmpty('resource.raintpl_tpl', 'tpl/'); | 301 | $this->setEmpty('resource.raintpl_tpl', 'tpl/'); |
302 | $this->setEmpty('resource.theme', 'default'); | ||
302 | $this->setEmpty('resource.raintpl_tmp', 'tmp/'); | 303 | $this->setEmpty('resource.raintpl_tmp', 'tmp/'); |
303 | $this->setEmpty('resource.thumbnails_cache', 'cache'); | 304 | $this->setEmpty('resource.thumbnails_cache', 'cache'); |
304 | $this->setEmpty('resource.page_cache', 'pagecache'); | 305 | $this->setEmpty('resource.page_cache', 'pagecache'); |
diff --git a/application/config/ConfigPhp.php b/application/config/ConfigPhp.php index 9dd9a65d..d7fd4baf 100644 --- a/application/config/ConfigPhp.php +++ b/application/config/ConfigPhp.php | |||
@@ -41,6 +41,7 @@ class ConfigPhp implements ConfigIO | |||
41 | 'resource.log' => 'config.LOG_FILE', | 41 | 'resource.log' => 'config.LOG_FILE', |
42 | 'resource.update_check' => 'config.UPDATECHECK_FILENAME', | 42 | 'resource.update_check' => 'config.UPDATECHECK_FILENAME', |
43 | 'resource.raintpl_tpl' => 'config.RAINTPL_TPL', | 43 | 'resource.raintpl_tpl' => 'config.RAINTPL_TPL', |
44 | 'resource.theme' => 'config.theme', | ||
44 | 'resource.raintpl_tmp' => 'config.RAINTPL_TMP', | 45 | 'resource.raintpl_tmp' => 'config.RAINTPL_TMP', |
45 | 'resource.thumbnails_cache' => 'config.CACHEDIR', | 46 | 'resource.thumbnails_cache' => 'config.CACHEDIR', |
46 | 'resource.page_cache' => 'config.PAGECACHE', | 47 | 'resource.page_cache' => 'config.PAGECACHE', |
@@ -99,7 +100,7 @@ class ConfigPhp implements ConfigIO | |||
99 | $configStr .= '$GLOBALS[\'' . $key . '\'] = ' . var_export($conf[$key], true) . ';' . PHP_EOL; | 100 | $configStr .= '$GLOBALS[\'' . $key . '\'] = ' . var_export($conf[$key], true) . ';' . PHP_EOL; |
100 | } | 101 | } |
101 | } | 102 | } |
102 | 103 | ||
103 | // Store all $conf['config'] | 104 | // Store all $conf['config'] |
104 | foreach ($conf['config'] as $key => $value) { | 105 | foreach ($conf['config'] as $key => $value) { |
105 | $configStr .= '$GLOBALS[\'config\'][\''. $key .'\'] = '.var_export($conf['config'][$key], true).';'. PHP_EOL; | 106 | $configStr .= '$GLOBALS[\'config\'][\''. $key .'\'] = '.var_export($conf['config'][$key], true).';'. PHP_EOL; |