Merge branch 'MDL-60437_33-multilang-html-block-titles' of https://github.com/lucaboesch/moodle into MOODLE_33_STABLE

2017-11-06 10:11:32 +08:00
parent 125d60d769 70de3574bb
commit 047785fbfd
1 changed files with 5 additions and 1 deletions
@@ -37,7 +37,11 @@ class block_html extends block_base {
    }

    function specialization() {
-        $this->title = isset($this->config->title) ? format_string($this->config->title) : format_string(get_string('newhtmlblock', 'block_html'));
+        if (isset($this->config->title)) {
+            $this->title = $this->title = format_string($this->config->title, true, ['context' => $this->context]);
+        } else {
+            $this->title = get_string('newhtmlblock', 'block_html');
+        }
    }

    function instance_allow_multiple() {