diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-03-09 18:32:50 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-03-09 18:32:50 +0000 |
| commit | b36c02f320e1d3250bbd5784d05d6044f70a19c8 (patch) | |
| tree | 37819db71eb43e2d47a5f476d59071c27ff5dabd /phpBB/includes/acm | |
| parent | b8834051eb5d7d376e7c5a2be273decdd6c9b886 (diff) | |
| download | forums-b36c02f320e1d3250bbd5784d05d6044f70a19c8.tar forums-b36c02f320e1d3250bbd5784d05d6044f70a19c8.tar.gz forums-b36c02f320e1d3250bbd5784d05d6044f70a19c8.tar.bz2 forums-b36c02f320e1d3250bbd5784d05d6044f70a19c8.tar.xz forums-b36c02f320e1d3250bbd5784d05d6044f70a19c8.zip | |
- fix cookie shortening
- let the acm handle the module cache
- call $cache->save() after destroying data if necessary
git-svn-id: file:///svn/phpbb/trunk@5612 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/acm')
| -rw-r--r-- | phpBB/includes/acm/acm_file.php | 3 | ||||
| -rw-r--r-- | phpBB/includes/acm/acm_main.php | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/phpBB/includes/acm/acm_file.php b/phpBB/includes/acm/acm_file.php index fa430b9247..3a11f5b6d6 100644 --- a/phpBB/includes/acm/acm_file.php +++ b/phpBB/includes/acm/acm_file.php @@ -191,6 +191,9 @@ class acm $this->is_modified = true; unset($this->vars[$var_name]); unset($this->var_expires[$var_name]); + + // We save here to let the following cache hits succeed + $this->save(); } } diff --git a/phpBB/includes/acm/acm_main.php b/phpBB/includes/acm/acm_main.php index 679998938f..3f6e413f20 100644 --- a/phpBB/includes/acm/acm_main.php +++ b/phpBB/includes/acm/acm_main.php @@ -301,7 +301,7 @@ class cache extends acm foreach ($parsed_items as $key => $parsed_array) { - $parsed_array = $this->get('_' . $key . '_cfg'); + $parsed_array = $this->get('_cfg_' . $key); if (!$parsed_array) { @@ -327,14 +327,13 @@ class cache extends acm $parsed_array = parse_cfg_file($filename); $parsed_array['filetime'] = @filemtime($filename); - $this->put('_' . $key . '_cfg', $parsed_array); + $this->put('_cfg_' . $key, $parsed_array); } $parsed_items[$key] = $parsed_array; } return $parsed_items; } - } ?>
\ No newline at end of file |