Permalink
Browse files

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

…moodle
  • Loading branch information...
danpoltawski committed May 27, 2013
2 parents 8778719 + f10a2e4 commit 92e24958e54bb138e5c00968e63a39750f7ecdff
Showing with 2 additions and 2 deletions.
  1. +2 −2 filter/activitynames/filter.php
@@ -85,9 +85,9 @@ function filter($text, array $options = array()) {
$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);
}
}

0 comments on commit 92e2495

Please sign in to comment.