Merge branch 'MDL-39185_m23' of https://github.com/markn86/moodle into MOODLE_23_STABLE

2013-04-19 13:53:19 +12:00
parent dd8e2dde96 534707ff8d
commit 8be4f7da65
1 changed files with 2 additions and 1 deletions
@@ -156,9 +156,10 @@
    }

    if (!empty($forum->blockafter) && !empty($forum->blockperiod)) {
+        $a = new stdClass();
        $a->blockafter = $forum->blockafter;
        $a->blockperiod = get_string('secondstotime'.$forum->blockperiod);
-        echo $OUTPUT->notification(get_string('thisforumisthrottled','forum',$a));
+        echo $OUTPUT->notification(get_string('thisforumisthrottled', 'forum', $a));
    }

    if ($forum->type == 'qanda' && !has_capability('moodle/course:manageactivities', $context)) {