Merge branch 'wip-MDL-39785-master' of git://github.com/marinaglancy/moodle

2013-05-27 14:17:00 +08:00
parent 87787191e4 f10a2e4207
commit 92e24958e5
1 changed files with 2 additions and 2 deletions
@@ -85,9 +85,9 @@ class filter_activitynames extends moodle_text_filter {
            $cmid = $this->context->instanceid;
            if ($this->context->contextlevel == CONTEXT_MODULE && isset(self::$activitylist[$cmid])) {
                // remove filterobjects for the current module
-                $filterslist = array_diff_key(self::$activitylist, array($cmid => 1, $cmid.'-e' => 1));
+                $filterslist = array_values(array_diff_key(self::$activitylist, array($cmid => 1, $cmid.'-e' => 1)));
            } else {
-                $filterslist = self::$activitylist;
+                $filterslist = array_values(self::$activitylist);
            }
        }