From bd4624765e0d162ebe9daaff01219ebc2c1d04c8 Mon Sep 17 00:00:00 2001 From: Sam Hemelryk Date: Thu, 11 Aug 2011 11:17:37 +0800 Subject: [PATCH] MDL-25636 block_html Fixed up missing format config if block restored from early 2.0 backup --- blocks/html/block_html.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/blocks/html/block_html.php b/blocks/html/block_html.php index cab89acfd58..bead128d884 100644 --- a/blocks/html/block_html.php +++ b/blocks/html/block_html.php @@ -62,7 +62,14 @@ class block_html extends block_base { if (isset($this->config->text)) { // rewrite url $this->config->text = file_rewrite_pluginfile_urls($this->config->text, 'pluginfile.php', $this->context->id, 'block_html', 'content', NULL); - $this->content->text = format_text($this->config->text, $this->config->format, $filteropt); + // Default to FORMAT_HTML which is what will have been used before the + // editor was properly implemented for the block. + $format = FORMAT_HTML; + // Check to see if the format has been properly set on the config + if (isset($this->config->format)) { + $format = $this->config->format; + } + $this->content->text = format_text($this->config->text, $format, $filteropt); } else { $this->content->text = ''; }