Merge branch 'MDL-69630-master' of git://github.com/mihailges/moodle

blocks/social_activities/tests/behat/edit_activities.feature

@@ -18,10 +18,11 @@ Feature: Edit activities in social activities block
       | student1 | C1 | student |
 
   @javascript
-  Scenario: Edit name of acitivity in-place in social activities block
+  Scenario: Edit name of activity in-place in social activities block
     Given I log in as "user1"
     And I am on "Course 1" course homepage with editing mode on
-    And I set the field "Add an activity to section 'section 0'" to "Forum"
+    And I press "Add an activity or resource"
+    And I click on "Add a new Forum" "link" in the "Add an activity or resource" "dialogue"
     And I set the field "Forum name" to "My forum name"
     And I press "Save and return to course"
     And I click on "Edit title" "link" in the "My forum name" activity in social activities block
@@ -42,7 +43,8 @@ Feature: Edit activities in social activities block
     And I log in as "user1"
     And I am on "Course 1" course homepage with editing mode on
     And I add the "Recent activity" block
-    And I set the field "Add an activity to section 'section 0'" to "Forum"
+    And I press "Add an activity or resource"
+    And I click on "Add a new Forum" "link" in the "Add an activity or resource" "dialogue"
     And I set the field "Forum name" to "My forum name"
     And I press "Save and return to course"
     And "My forum name" activity in social activities block should have "Hide" editing icon

course/format/social/lib.php

@@ -131,4 +131,19 @@ class format_social extends format_base {
         // Return everything (nothing to hide).
         return $this->get_format_options();
     }
+
+    /**
+     * Returns the information about the ajax support in the given source format.
+     *
+     * The returned object's property (boolean)capable indicates that
+     * the course format supports Moodle course ajax features.
+     *
+     * @return stdClass
+     */
+    public function supports_ajax() {
+        $ajaxsupport = new stdClass();
+        $ajaxsupport->capable = true;
+        return $ajaxsupport;
+    }
+
 }

course/format/upgrade.txt

@@ -2,6 +2,9 @@ This files describes API changes for course formats
 
 Overview of this plugin type at http://docs.moodle.org/dev/Course_formats
 
+=== 3.10 ===
+* Added the missing callback supports_ajax() to format_social.
+
 === 3.9 ===
 
 * The following functions, previously used (exclusively) by upgrade steps are not available anymore because of the upgrade cleanup performed for this version. See MDL-65809 for more info: