mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-18 05:58:34 +01:00
Code Issues Projects Releases Wiki Activity

MDL-22052 Improved get_string caching - dirty on-disk cache detection

Browse Source 
If the string is not found, core_string_manager tries to re-fetch master
sources. This prevents false debugging messages in case when the on-disk
cache is dirty. Thanks to Eloy, Tim and Petr for the ideas.
This commit is contained in:
David Mudrak 2010-06-25 09:40:34 +00:00
parent 43240ea13f
commit 477912aec1
1 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
lib/moodlelib.php
View File

@ -5786,9 +5786,10 @@ class core_string_manager implements string_manager {
* Load all strings for one component
* @param string $component The module the string is associated with
* @param string $lang
* @param bool $disablecache Do not use caches, force fetching the strings from sources
* @return array of all string for given component and lang
*/
public function load_component_strings($component, $lang) {
public function load_component_strings($component, $lang, $disablecache=false) {
global $CFG;
list($plugintype, $pluginname) = normalize_component($component);
@ -5798,17 +5799,19 @@ class core_string_manager implements string_manager {
$component = $plugintype . '_' . $pluginname;
}
// try in-memory cache first
if (isset($this->cache[$lang][$component])) {
$this->countmemcache++;
return $this->cache[$lang][$component];
}
if (!$disablecache) {
// try in-memory cache first
if (isset($this->cache[$lang][$component])) {
$this->countmemcache++;
return $this->cache[$lang][$component];
}
// try on-disk cache then
if ($this->usediskcache and file_exists($this->cacheroot . "/$lang/$component.php")) {
$this->countdiskcache++;
include($this->cacheroot . "/$lang/$component.php");
return $this->cache[$lang][$component];
// try on-disk cache then
if ($this->usediskcache and file_exists($this->cacheroot . "/$lang/$component.php")) {
$this->countdiskcache++;
include($this->cacheroot . "/$lang/$component.php");
return $this->cache[$lang][$component];
}
}
// no cache found - let us merge all possible sources of the strings
@ -5911,7 +5914,7 @@ class core_string_manager implements string_manager {
return false;
}
$lang = current_language();
$string = $this->load_component_strings($component, $lang);
$string = $this->load_component_strings($component, $lang, true);
return isset($string[$identifier]);
}
@ -5968,8 +5971,15 @@ class core_string_manager implements string_manager {
// parentlanguage is a special string, undefined means use English if not defined
return 'en';
}
debugging("Invalid get_string() identifier: '$identifier' or component '$component'", DEBUG_DEVELOPER);
return "[[$identifier]]";
if ($this->usediskcache) {
// maybe the on-disk cache is dirty - let the last attempt be to find the string in original sources
$string = $this->load_component_strings($component, $lang, true);
}
if (!isset($string[$identifier])) {
// the string is still missing - should be fixed by developer
debugging("Invalid get_string() identifier: '$identifier' or component '$component'", DEBUG_DEVELOPER);
return "[[$identifier]]";
}
}
$string = $string[$identifier];