L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-42664 Fix the filter_manager instantiation

Browse Source 
For legacy reasons, the $CFG->perfdebug uses values 7 for disabled and 15 for
enabled. Because of this typo, Moodle has always created instance of the slower
performance_measuring_filter_manager instead of the standard filter_manager,
regardless the perfdebug setting.
This commit is contained in:
David Mudrák
2013-11-01 09:19:22 +01:00
parent 67d4599aff
commit 2c6520c719
2 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/filterlib.php
+1 -1
View File
@@ -81,7 +81,7 @@ class filter_manager {
public static function instance() {
global $CFG;
if (is_null(self::$singletoninstance)) {
if (!empty($CFG->perfdebug)) {
if (!empty($CFG->perfdebug) and $CFG->perfdebug > 7) {
self::$singletoninstance = new performance_measuring_filter_manager();
} else {
self::$singletoninstance = new self();
lib/tests/filter_test.php
+19
View File
@@ -723,3 +723,22 @@ class filter_filter_set_applies_to_strings extends advanced_testcase {
$this->assertEquals(1, $CFG->filterall);
}
}
class filter_manager_testcase extends advanced_testcase {
public function test_filter_manager_instance() {
$this->resetAfterTest();
set_config('perfdebug', 7);
filter_manager::reset_caches();
$filterman = filter_manager::instance();
$this->assertInstanceOf('filter_manager', $filterman);
$this->assertNotInstanceOf('performance_measuring_filter_manager', $filterman);
set_config('perfdebug', 15);
filter_manager::reset_caches();
$filterman = filter_manager::instance();
$this->assertInstanceOf('filter_manager', $filterman);
$this->assertInstanceOf('performance_measuring_filter_manager', $filterman);
}
}