Permalink
Browse files

MDL-25636 block_html Fixed up missing format config if block restored…

… from early 2.0 backup
  • Loading branch information...
1 parent 3fdc622 commit bd4624765e0d162ebe9daaff01219ebc2c1d04c8 Sam Hemelryk committed Aug 11, 2011
Showing with 8 additions and 1 deletion.
  1. +8 −1 blocks/html/block_html.php
@@ -62,7 +62,14 @@ function get_content() {
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 = '';
}

0 comments on commit bd46247

Please sign in to comment.