Merge branch 'MDL-46346_blog' of https://github.com/andyjdavis/moodle

diff --cc blog/edit_form.php
index 2b28a73,1f60ebf..805bf79
--- 1/blog/edit_form.php
--- 2/blog/edit_form.php
+++ b/blog/edit_form.php
@@@ -130,7 -142,12 +142,13 @@@ class blog_edit_form extends moodlefor
          $mform->setDefault('courseid', $courseid);
      }
  
-     function validation($data, $files) {
+     /**
+      * Validate the blog form data.
 -     * @param $data array Data to be validated
 -     * @param $files void unused
++     * @param array $data Data to be validated
++     * @param array $files unused
++     * @return array|bool
+      */
+     public function validation($data, $files) {
          global $CFG, $DB, $USER;
  
          $errors = array();

diff --cc blog/external_blog_edit.php
Simple merge

diff --cc blog/external_blog_edit_form.php
index fb64d29,576feb1..fc28e9a
--- 1/blog/external_blog_edit_form.php
--- 2/blog/external_blog_edit_form.php
+++ b/blog/external_blog_edit_form.php
@@@ -118,11 -117,9 +117,11 @@@ class blog_edit_external_form extends m
          if ($id = $mform->getElementValue('id')) {
              $mform->setDefault('autotags', implode(',', tag_get_tags_array('blog_external', $id)));
              $mform->freeze('url');
 -            $mform->freeze('filtertags');
 +            if ($mform->elementExists('filtertags')) {
 +                $mform->freeze('filtertags');
 +            }
              // TODO change the filtertags element to a multiple select, using the tags of the external blog
-             // Use $rss->get_channel_tags()
+             // Use $rss->get_channel_tags().
          }
      }
  }