Merge branch 'MDL-57283_master' of git://github.com/markn86/moodle

2016-12-07 10:16:54 +00:00
parent eec60baeca 07af06df96
commit ee1f658207
1 changed files with 3 additions and 0 deletions
@@ -295,6 +295,9 @@ class filter_manager {
                $filter = $this->textfilters[$context->id][$name];
            } else {
                $filter = $this->make_filter_object($name, $context, $config);
+                if (is_null($filter)) {
+                    continue;
+                }
            }
            $filter->setup($page, $context);
        }