aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acm
diff options
context:
space:
mode:
Diffstat (limited to 'phpBB/includes/acm')
-rw-r--r--phpBB/includes/acm/acm_file.php3
-rw-r--r--phpBB/includes/acm/acm_main.php5
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