more fixes for M4.4

lib.php

@@ -885,7 +885,8 @@ function moodleoverflow_send_mails() {
 
                 // Preapare to actually send the post now. Build up the content.
                 $cleanname = str_replace('"', "'", strip_tags(format_string($moodleoverflow->name)));
-                $shortname = format_string($course->shortname, true, ['context' => context_course::instance($course->id)]);
+                $coursecontext = context_course::instance($course->id);
+                $shortname = format_string($course->shortname, true, ['context' => $coursecontext]);
 
                 // Define a header to make mails easier to track.
                 $emailmessageid = generate_email_messageid('moodlemoodleoverflow' . $moodleoverflow->id);

tests/behat/add_moodleoverflow.feature

@@ -19,7 +19,7 @@ Feature: Add moodleoverflow activities and discussions
     And I log in as "teacher1"
     And I am on "Course 1" course homepage
     And I turn editing mode on
-    And I add a "Moodleoverflow" activity to course "C1" section "1" and I fill the form with:
+    And I add a moodleoverflow to course "C1" section "1" and I fill the form with:
       | Moodleoverflow name | Test moodleoverflow name |
       | Description | Test forum description |
     And I add a new discussion to "Test moodleoverflow name" moodleoverflow with:

tests/behat/behat_mod_moodleoverflow.php

@@ -41,6 +41,31 @@
  */
 class behat_mod_moodleoverflow extends behat_base {
 
+    /**
+     * Adds a new moodleoverflow to the specified course and section.
+     *
+     * @Given I add a moodleoverflow to course :coursefullname section :sectionnum and I fill the form with:
+     * @param $courseshortname
+     * @param $sectionnumber
+     * @param $data
+     * @return void
+     */
+    public function i_add_a_moodleoverflow_to_course_section_and_fill_form($courseshortname, $sectionnumber, TableNode $data) {
+        global $CFG;
+
+        if ($CFG->branch >= 404) {
+            $this->execute(
+                "behat_course::i_add_to_course_section_and_i_fill_the_form_with",
+                [$this->escape('moodleoverflow'), $this->escape($courseshortname), $this->escape($sectionnumber), $data]
+            );
+        } else {
+            $this->execute(
+                "behat_course_deprecated::i_add_to_section_and_i_fill_the_form_with",
+                [$this->escape('moodleoverflow'), $this->escape($sectionnumber), $data]
+            );
+        }
+    }
+
     /**
      * Adds a topic to the moodleoverflow specified by it's name. Useful for the Announcements and blog-style moodleoverflow.
      *

tests/behat/delete_file.feature

@@ -17,7 +17,7 @@ Feature: Delete attachments
     And I log in as "teacher1"
     And I am on "Course 1" course homepage
     And I turn editing mode on
-    And I add a "Moodleoverflow" activity to course "C1" section "1" and I fill the form with:
+    And I add a moodleoverflow to course "C1" section "1" and I fill the form with:
       | Moodleoverflow name | Test moodleoverflow name |
       | Description | Test forum description |
     And I add a new discussion to "Test moodleoverflow name" moodleoverflow with: