Merge branch 'MDL-57600-master' of git://github.com/lameze/moodle

diff --git a/admin/tool/customlang/db/upgrade.php b/admin/tool/customlang/db/upgrade.php
index a7ff6a3..e771cc9 100644 (file)
--- a/admin/tool/customlang/db/upgrade.php
+++ b/admin/tool/customlang/db/upgrade.php
@@ -38,5 +38,8 @@ function xmldb_tool_customlang_upgrade($oldversion) {
     // Automatically generated Moodle v3.4.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

diff --git a/admin/tool/dataprivacy/createdatarequest.php b/admin/tool/dataprivacy/createdatarequest.php
index cd7f575..83a5c90 100644 (file)
--- a/admin/tool/dataprivacy/createdatarequest.php
+++ b/admin/tool/dataprivacy/createdatarequest.php
@@ -53,8 +53,9 @@ if ($manage) {
 $PAGE->set_context($context);
 
 // If contactdataprotectionofficer is disabled, send the user back to the profile page, or the privacy policy page.
-if (!\tool_dataprivacy\api::can_contact_dpo()) {
-    redirect($returnurl, get_string('contactdpoviaprivacypolicy', 'tool_dataprivacy'), \core\output\notification::NOTIFY_ERROR);
+// That is, unless you have sufficient capabilities to perform this on behalf of a user.
+if (!$manage && !\tool_dataprivacy\api::can_contact_dpo()) {
+    redirect($returnurl, get_string('contactdpoviaprivacypolicy', 'tool_dataprivacy'), 0, \core\output\notification::NOTIFY_ERROR);
 }
 
 $mform = new tool_dataprivacy_data_request_form($url->out(false), ['manage' => !empty($manage)]);

diff --git a/admin/tool/log/db/upgrade.php b/admin/tool/log/db/upgrade.php
index 06d7441..2c7e2b0 100644 (file)
--- a/admin/tool/log/db/upgrade.php
+++ b/admin/tool/log/db/upgrade.php
@@ -42,5 +42,8 @@ function xmldb_tool_log_upgrade($oldversion) {
     // Automatically generated Moodle v3.4.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

diff --git a/admin/tool/log/store/database/db/upgrade.php b/admin/tool/log/store/database/db/upgrade.php
index f9c8a8b..7b6fed2 100644 (file)
--- a/admin/tool/log/store/database/db/upgrade.php
+++ b/admin/tool/log/store/database/db/upgrade.php
@@ -36,5 +36,8 @@ function xmldb_logstore_database_upgrade($oldversion) {
     // Automatically generated Moodle v3.4.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

diff --git a/admin/tool/log/store/standard/db/upgrade.php b/admin/tool/log/store/standard/db/upgrade.php
index 610b61c..f0dd415 100644 (file)
--- a/admin/tool/log/store/standard/db/upgrade.php
+++ b/admin/tool/log/store/standard/db/upgrade.php
@@ -36,5 +36,8 @@ function xmldb_logstore_standard_upgrade($oldversion) {
     // Automatically generated Moodle v3.4.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

diff --git a/admin/tool/monitor/db/upgrade.php b/admin/tool/monitor/db/upgrade.php
index 1358647..67fbb42 100644 (file)
--- a/admin/tool/monitor/db/upgrade.php
+++ b/admin/tool/monitor/db/upgrade.php
@@ -76,5 +76,8 @@ function xmldb_tool_monitor_upgrade($oldversion) {
     // Automatically generated Moodle v3.4.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

diff --git a/admin/tool/policy/classes/output/page_agreedocs.php b/admin/tool/policy/classes/output/page_agreedocs.php
index 5ede161..af6ebd6 100644 (file)
--- a/admin/tool/policy/classes/output/page_agreedocs.php
+++ b/admin/tool/policy/classes/output/page_agreedocs.php
@@ -69,6 +69,9 @@ class page_agreedocs implements renderable, templatable {
     /** @var array Info or error messages to show. */
     protected $messages = [];
 
+    /** @var bool This is an existing user (rather than non-loggedin/guest). */
+    protected $isexistinguser;
+
     /**
      * Prepare the page for rendering.
      *
@@ -87,6 +90,7 @@ class page_agreedocs implements renderable, templatable {
 
         $this->action = $action;
 
+        $this->isexistinguser = isloggedin() && !isguestuser();
         $behalfid = $behalfid ?: $USER->id;
         if ($realuser->id != $behalfid) {
             $this->behalfuser = core_user::get_user($behalfid, '*', MUST_EXIST);
@@ -112,7 +116,7 @@ class page_agreedocs implements renderable, templatable {
     protected function accept_and_revoke_policies() {
         global $USER;
 
-        if (!empty($USER->id)) {
+        if ($this->isexistinguser) {
             // Existing user.
             if (!empty($this->action) && confirm_sesskey()) {
                 // The form has been sent. Update policies acceptances according to $this->agreedocs.
@@ -182,15 +186,13 @@ class page_agreedocs implements renderable, templatable {
      * Before display the consent page, the user has to view all the still-non-accepted policy docs.
      * This function checks if the non-accepted policy docs have been shown and redirect to them.
      *
-     * @param array $userid User identifier who wants to access to the consent page.
-     * @param url $returnurl URL to return after shown the policy docs.
+     * @param int $userid User identifier who wants to access to the consent page.
+     * @param moodle_url $returnurl URL to return after shown the policy docs.
      */
     protected function redirect_to_policies($userid, $returnurl = null) {
-        global $USER;
-
-        $acceptances = api::get_user_acceptances($userid);
         $allpolicies = $this->policies;
-        if (!empty($userid)) {
+        if ($this->isexistinguser) {
+            $acceptances = api::get_user_acceptances($userid);
             foreach ($allpolicies as $policy) {
                 if (api::is_user_version_accepted($userid, $policy->id, $acceptances)) {
                     // If this version is accepted by the user, remove from the pending policies list.
@@ -234,16 +236,30 @@ class page_agreedocs implements renderable, templatable {
     }
 
     /**
-     * Redirect to $SESSION->wantsurl if defined or to $CFG->wwwroot if not.
+     * Redirect to signup page if defined or to $CFG->wwwroot if not.
      */
     protected function redirect_to_previous_url() {
         global $SESSION;
 
-        if (!empty($SESSION->wantsurl)) {
-            $returnurl = $SESSION->wantsurl;
-            unset($SESSION->wantsurl);
+        if ($this->isexistinguser) {
+            // Existing user.
+            if (!empty($SESSION->wantsurl)) {
+                $returnurl = $SESSION->wantsurl;
+                unset($SESSION->wantsurl);
+            } else {
+                $returnurl = new moodle_url('/admin/tool/policy/user.php');
+            }
         } else {
-            $returnurl = (new moodle_url('/admin/tool/policy/user.php'))->out();
+            // Non-authenticated user.
+            $issignup = \cache::make('core', 'presignup')->get('tool_policy_issignup');
+            if ($issignup) {
+                // User came here from signup page - redirect back there.
+                $returnurl = new moodle_url('/login/signup.php');
+                \cache::make('core', 'presignup')->set('tool_policy_issignup', false);
+            } else {
+                // Guests should not be on this page unless it's part of signup - redirect home.
+                $returnurl = new moodle_url('/');
+            }
         }
 
         redirect($returnurl);
@@ -255,35 +271,35 @@ class page_agreedocs implements renderable, templatable {
      * @param int $userid
      */
     protected function prepare_global_page_access($userid) {
-        global $PAGE, $SESSION, $SITE, $USER;
+        global $PAGE, $SITE, $USER;
 
         // Guest users or not logged users (but the users during the signup process) are not allowed to access to this page.
-        $newsignupuser = !empty($SESSION->wantsurl) && strpos($SESSION->wantsurl, 'login/signup.php') !== false;
-        if (isguestuser() || (empty($USER->id) && !$newsignupuser)) {
+        $newsignupuser = \cache::make('core', 'presignup')->get('tool_policy_issignup');
+        if (!$this->isexistinguser && !$newsignupuser) {
             $this->redirect_to_previous_url();
         }
 
         // Check for correct user capabilities.
-        if (!empty($USER->id)) {
+        if ($this->isexistinguser) {
             // For existing users, it's needed to check if they have the capability for accepting policies.
             api::can_accept_policies($this->behalfid, true);
         } else {
             // For new users, the behalfid parameter is ignored.
-            if ($this->behalfid != $USER->id) {
+            if ($this->behalfid) {
                 redirect(new moodle_url('/admin/tool/policy/index.php'));
             }
         }
 
         // If the current user has the $USER->policyagreed = 1 or $userpolicyagreed = 1
-        // and $SESSION->wantsurl is defined, redirect to the return page.
-        $hasagreedsignupuser = empty($USER->id) && $this->signupuserpolicyagreed;
+        // redirect to the return page.
+        $hasagreedsignupuser = !$this->isexistinguser && $this->signupuserpolicyagreed;
         $hasagreedloggeduser = $USER->id == $userid && !empty($USER->policyagreed);
         if (!is_siteadmin() && ($hasagreedsignupuser || $hasagreedloggeduser)) {
             $this->redirect_to_previous_url();
         }
 
         $myparams = [];
-        if (!empty($USER->id) && !empty($this->behalfid) && $this->behalfid != $USER->id) {
+        if ($this->isexistinguser && !empty($this->behalfid) && $this->behalfid != $USER->id) {
             $myparams['userid'] = $this->behalfid;
         }
         $myurl = new moodle_url('/admin/tool/policy/index.php', $myparams);
@@ -308,7 +324,6 @@ class page_agreedocs implements renderable, templatable {
         global $USER;
 
         // Get all the policy version acceptances for this user.
-        $acceptances = api::get_user_acceptances($userid);
         $lang = current_language();
         foreach ($this->policies as $policy) {
             // Get a link to display the full policy document.
@@ -320,9 +335,10 @@ class page_agreedocs implements renderable, templatable {
             $policymodal = html_writer::link($policy->url, $policy->name, $policyattributes);
 
             // Check if this policy version has been agreed or not.
-            if (!empty($userid)) {
+            if ($this->isexistinguser) {
                 // Existing user.
                 $versionagreed = false;
+                $acceptances = api::get_user_acceptances($userid);
                 $policy->versionacceptance = api::get_user_version_acceptance($userid, $policy->id, $acceptances);
                 if (!empty($policy->versionacceptance)) {
                     // The policy version has ever been agreed. Check if status = 1 to know if still is accepted.
@@ -352,13 +368,13 @@ class page_agreedocs implements renderable, templatable {
      * Export the page data for the mustache template.
      *
      * @param renderer_base $output renderer to be used to render the page elements.
-     * @return stdClass
+     * @return \stdClass
      */
     public function export_for_template(renderer_base $output) {
         global $USER;
 
         $myparams = [];
-        if (!empty($USER->id) && !empty($this->behalfid) && $this->behalfid != $USER->id) {
+        if ($this->isexistinguser && !empty($this->behalfid) && $this->behalfid != $USER->id) {
             $myparams['userid'] = $this->behalfid;
         }
         $data = (object) [

diff --git a/admin/tool/policy/index.php b/admin/tool/policy/index.php
index 4be8554..067d8fa 100644 (file)
--- a/admin/tool/policy/index.php
+++ b/admin/tool/policy/index.php
@@ -45,7 +45,7 @@ $PAGE->set_pagelayout('standard');
 $PAGE->set_url('/admin/tool/policy/index.php');
 $PAGE->set_popup_notification_allowed(false);
 
-if (!empty($USER->id)) {
+if (isloggedin() && !isguestuser()) {
     // Existing user.
     $haspermissionagreedocs = api::can_accept_policies($behalfid);
 } else {

diff --git a/admin/tool/policy/lib.php b/admin/tool/policy/lib.php
index 6c9afa9..3073212 100644 (file)
--- a/admin/tool/policy/lib.php
+++ b/admin/tool/policy/lib.php
@@ -116,7 +116,7 @@ function tool_policy_standard_footer_html() {
  * Hooks redirection to policy acceptance pages before sign up.
  */
 function tool_policy_pre_signup_requests() {
-    global $CFG, $SESSION;
+    global $CFG;
 
     // Do nothing if we are not set as the site policies handler.
     if (empty($CFG->sitepolicyhandler) || $CFG->sitepolicyhandler !== 'tool_policy') {
@@ -127,7 +127,7 @@ function tool_policy_pre_signup_requests() {
     $userpolicyagreed = cache::make('core', 'presignup')->get('tool_policy_userpolicyagreed');
     if (!empty($policies) && !$userpolicyagreed) {
         // Redirect to "Policy" pages for consenting before creating the user.
-        $SESSION->wantsurl = (new \moodle_url('/login/signup.php'))->out();
+        cache::make('core', 'presignup')->set('tool_policy_issignup', 1);
         redirect(new \moodle_url('/admin/tool/policy/index.php'));
     }
 }

diff --git a/admin/tool/policy/tests/behat/consent.feature b/admin/tool/policy/tests/behat/consent.feature
index ec9aae6..fde43cc 100644 (file)
--- a/admin/tool/policy/tests/behat/consent.feature
+++ b/admin/tool/policy/tests/behat/consent.feature
@@ -611,3 +611,55 @@ Feature: User must accept policy managed by this plugin when logging in and sign
     And I should see "Policies and agreements"
     And I should see "No permission to agree to the policies on behalf of this user"
     And I should see "Sorry, you do not have the required permission to agree to the following policies on behalf of User 1"
+
+  Scenario: Accept policy on sign up as a guest, one policy
+    Given the following config values are set as admin:
+      | registerauth    | email |
+      | passwordpolicy  | 0     |
+      | sitepolicyhandler | tool_policy |
+    Given the following policies exist:
+      | Policy | Name             | Revision | Content    | Summary     | Status   |
+      | P1     | This site policy |          | full text1 | short text1 | archived |
+      | P1     | This site policy |          | full text2 | short text2 | active   |
+      | P1     | This site policy |          | full text3 | short text3 | draft    |
+    And I am on site homepage
+    And I follow "Log in"
+    # First log in as a guest
+    And I press "Log in as a guest"
+    # Now sign up
+    And I follow "Log in"
+    When I press "Create new account"
+    Then I should see "This site policy"
+    And I should see "short text2"
+    And I should see "full text2"
+    And I press "Next"
+    And I should see "Please agree to the following policies"
+    And I should see "This site policy"
+    And I should see "short text2"
+    And I should not see "full text2"
+    And I set the field "I agree to the This site policy" to "1"
+    And I press "Next"
+    And I should not see "I understand and agree"
+    And I set the following fields to these values:
+      | Username      | user1                 |
+      | Password      | user1                 |
+      | Email address | user1@address.invalid |
+      | Email (again) | user1@address.invalid |
+      | First name    | User1                 |
+      | Surname       | L1                    |
+    And I press "Create my new account"
+    And I should see "Confirm your account"
+    And I should see "An email should have been sent to your address at user1@address.invalid"
+    And I confirm email for "user1"
+    And I should see "Thanks, User1 L1"
+    And I should see "Your registration has been confirmed"
+    And I open my profile in edit mode
+    And the field "First name" matches value "User1"
+    And I log out
+    # Confirm that user can login and browse the site.
+    And I log in as "user1"
+    And I follow "Profile" in the user menu
+    # User can see his own agreements in the profile.
+    And I follow "Policies and agreements"
+    And "Agreed" "icon" should exist in the "This site policy" "table_row"
+    And I log out

diff --git a/admin/tool/recyclebin/classes/category_bin.php b/admin/tool/recyclebin/classes/category_bin.php
index 26d8b53..f352de2 100644 (file)
--- a/admin/tool/recyclebin/classes/category_bin.php
+++ b/admin/tool/recyclebin/classes/category_bin.php
@@ -288,13 +288,24 @@ class category_bin extends base_bin {
         global $DB;
 
         // Grab the course category context.
-        $context = \context_coursecat::instance($this->_categoryid);
-
-        // Delete the files.
-        $fs = get_file_storage();
-        $files = $fs->get_area_files($context->id, 'tool_recyclebin', TOOL_RECYCLEBIN_COURSECAT_BIN_FILEAREA, $item->id);
-        foreach ($files as $file) {
-            $file->delete();
+        $context = \context_coursecat::instance($this->_categoryid, IGNORE_MISSING);
+        if (!empty($context)) {
+            // Delete the files.
+            $fs = get_file_storage();
+            $fs->delete_area_files($context->id, 'tool_recyclebin', TOOL_RECYCLEBIN_COURSECAT_BIN_FILEAREA, $item->id);
+        } else {
+            // Course category has been deleted. Find records using $item->id as this is unique for coursecat recylebin.
+            $files = $DB->get_recordset('files', [
+                'component' => 'tool_recyclebin',
+                'filearea' => TOOL_RECYCLEBIN_COURSECAT_BIN_FILEAREA,
+                'itemid' => $item->id,
+            ]);
+            $fs = get_file_storage();
+            foreach ($files as $filer) {
+                $file = $fs->get_file_instance($filer);
+                $file->delete();
+            }
+            $file->close();
         }
 
         // Delete the record.
@@ -302,6 +313,11 @@ class category_bin extends base_bin {
             'id' => $item->id
         ));
 
+        // The coursecat might have been deleted, check we have a context before triggering event.
+        if (!$context) {
+            return;
+        }
+
         // Fire event.
         $event = \tool_recyclebin\event\category_bin_item_deleted::create(array(
             'objectid' => $item->id,

diff --git a/admin/tool/recyclebin/classes/course_bin.php b/admin/tool/recyclebin/classes/course_bin.php
index e935d69..fb5d779 100644 (file)
--- a/admin/tool/recyclebin/classes/course_bin.php
+++ b/admin/tool/recyclebin/classes/course_bin.php
@@ -274,13 +274,25 @@ class course_bin extends base_bin {
         global $DB;
 
         // Grab the course context.
-        $context = \context_course::instance($this->_courseid);
-
-        // Delete the files.
-        $fs = get_file_storage();
-        $files = $fs->get_area_files($context->id, 'tool_recyclebin', TOOL_RECYCLEBIN_COURSE_BIN_FILEAREA, $item->id);
-        foreach ($files as $file) {
-            $file->delete();
+        $context = \context_course::instance($this->_courseid, IGNORE_MISSING);
+
+        if (!empty($context)) {
+            // Delete the files.
+            $fs = get_file_storage();
+            $fs->delete_area_files($context->id, 'tool_recyclebin', TOOL_RECYCLEBIN_COURSE_BIN_FILEAREA, $item->id);
+        } else {
+            // Course context has been deleted. Find records using $item->id as this is unique for course bin recyclebin.
+            $files = $DB->get_recordset('files', [
+                'component' => 'tool_recyclebin',
+                'filearea' => TOOL_RECYCLEBIN_COURSE_BIN_FILEAREA,
+                'itemid' => $item->id,
+            ]);
+            $fs = get_file_storage();
+            foreach ($files as $filer) {
+                $file = $fs->get_file_instance($filer);
+                $file->delete();
+            }
+            $files->close();
         }
 
         // Delete the record.

diff --git a/admin/tool/usertours/db/upgrade.php b/admin/tool/usertours/db/upgrade.php
index c564472..088b76b 100644 (file)
--- a/admin/tool/usertours/db/upgrade.php
+++ b/admin/tool/usertours/db/upgrade.php
@@ -51,5 +51,8 @@ function xmldb_tool_usertours_upgrade($oldversion) {
     // Automatically generated Moodle v3.4.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

diff --git a/auth/cas/db/upgrade.php b/auth/cas/db/upgrade.php
index f3999b3..f331335 100644 (file)
--- a/auth/cas/db/upgrade.php
+++ b/auth/cas/db/upgrade.php
@@ -48,5 +48,8 @@ function xmldb_auth_cas_upgrade($oldversion) {
     // Automatically generated Moodle v3.4.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

diff --git a/auth/db/db/upgrade.php b/auth/db/db/upgrade.php
index 621a17e..57bdd1e 100644 (file)
--- a/auth/db/db/upgrade.php
+++ b/auth/db/db/upgrade.php
@@ -48,5 +48,8 @@ function xmldb_auth_db_upgrade($oldversion) {
     // Automatically generated Moodle v3.4.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

diff --git a/auth/email/db/upgrade.php b/auth/email/db/upgrade.php
index 9af8c79..0ad4e2d 100644 (file)
--- a/auth/email/db/upgrade.php
+++ b/auth/email/db/upgrade.php
@@ -48,5 +48,8 @@ function xmldb_auth_email_upgrade($oldversion) {
     // Automatically generated Moodle v3.4.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

diff --git a/auth/ldap/db/upgrade.php b/auth/ldap/db/upgrade.php
index 02f1323..2132366 100644 (file)
--- a/auth/ldap/db/upgrade.php
+++ b/auth/ldap/db/upgrade.php
@@ -66,5 +66,8 @@ function xmldb_auth_ldap_upgrade($oldversion) {
     // Automatically generated Moodle v3.4.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

diff --git a/auth/manual/db/upgrade.php b/auth/manual/db/upgrade.php
index 03dbdb2..40499cd 100644 (file)
--- a/auth/manual/db/upgrade.php
+++ b/auth/manual/db/upgrade.php
@@ -48,5 +48,8 @@ function xmldb_auth_manual_upgrade($oldversion) {
     // Automatically generated Moodle v3.4.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

diff --git a/auth/mnet/db/upgrade.php b/auth/mnet/db/upgrade.php
index 9db6da9..09690f0 100644 (file)
--- a/auth/mnet/db/upgrade.php
+++ b/auth/mnet/db/upgrade.php
@@ -47,5 +47,8 @@ function xmldb_auth_mnet_upgrade($oldversion) {
     // Automatically generated Moodle v3.4.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

diff --git a/auth/none/db/upgrade.php b/auth/none/db/upgrade.php
index 981d9ee..aa1ad76 100644 (file)
--- a/auth/none/db/upgrade.php
+++ b/auth/none/db/upgrade.php
@@ -48,5 +48,8 @@ function xmldb_auth_none_upgrade($oldversion) {
     // Automatically generated Moodle v3.4.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

diff --git a/auth/oauth2/db/upgrade.php b/auth/oauth2/db/upgrade.php
index d213cce..4d7a093 100644 (file)
--- a/auth/oauth2/db/upgrade.php
+++ b/auth/oauth2/db/upgrade.php
@@ -44,5 +44,8 @@ function xmldb_auth_oauth2_upgrade($oldversion) {
     // Automatically generated Moodle v3.4.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

diff --git a/auth/shibboleth/db/upgrade.php b/auth/shibboleth/db/upgrade.php
index 43e07dd..9dbf7c3 100644 (file)
--- a/auth/shibboleth/db/upgrade.php
+++ b/auth/shibboleth/db/upgrade.php
@@ -48,5 +48,8 @@ function xmldb_auth_shibboleth_upgrade($oldversion) {
     // Automatically generated Moodle v3.4.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

diff --git a/blocks/badges/db/upgrade.php b/blocks/badges/db/upgrade.php
index bb9b3cf..a352f44 100644 (file)
--- a/blocks/badges/db/upgrade.php
+++ b/blocks/badges/db/upgrade.php
@@ -54,5 +54,8 @@ function xmldb_block_badges_upgrade($oldversion, $block) {
     // Automatically generated Moodle v3.4.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

diff --git a/blocks/calendar_month/db/upgrade.php b/blocks/calendar_month/db/upgrade.php
index 4403a77..81eec4e 100644 (file)
--- a/blocks/calendar_month/db/upgrade.php
+++ b/blocks/calendar_month/db/upgrade.php
@@ -54,5 +54,8 @@ function xmldb_block_calendar_month_upgrade($oldversion, $block) {
     // Automatically generated Moodle v3.4.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

diff --git a/blocks/calendar_upcoming/db/upgrade.php b/blocks/calendar_upcoming/db/upgrade.php
index dbe19a5..3e768b0 100644 (file)
--- a/blocks/calendar_upcoming/db/upgrade.php
+++ b/blocks/calendar_upcoming/db/upgrade.php
@@ -54,5 +54,8 @@ function xmldb_block_calendar_upcoming_upgrade($oldversion, $block) {
     // Automatically generated Moodle v3.4.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

diff --git a/blocks/community/db/upgrade.php b/blocks/community/db/upgrade.php
index d01face..30d70e3 100644 (file)
--- a/blocks/community/db/upgrade.php
+++ b/blocks/community/db/upgrade.php
@@ -55,5 +55,8 @@ function xmldb_block_community_upgrade($oldversion) {
     // Automatically generated Moodle v3.4.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

diff --git a/blocks/completionstatus/db/upgrade.php b/blocks/completionstatus/db/upgrade.php
index f0837fc..ce5ac4b 100644 (file)
--- a/blocks/completionstatus/db/upgrade.php
+++ b/blocks/completionstatus/db/upgrade.php
@@ -57,5 +57,8 @@ function xmldb_block_completionstatus_upgrade($oldversion, $block) {
     // Automatically generated Moodle v3.4.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

diff --git a/blocks/course_summary/db/upgrade.php b/blocks/course_summary/db/upgrade.php
index 763a538..d0872b4 100644 (file)
--- a/blocks/course_summary/db/upgrade.php
+++ b/blocks/course_summary/db/upgrade.php
@@ -57,5 +57,8 @@ function xmldb_block_course_summary_upgrade($oldversion, $block) {
     // Automatically generated Moodle v3.4.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

diff --git a/blocks/html/db/upgrade.php b/blocks/html/db/upgrade.php
index 5ad7f22..930ebde 100644 (file)
--- a/blocks/html/db/upgrade.php
+++ b/blocks/html/db/upgrade.php
@@ -42,5 +42,8 @@ function xmldb_block_html_upgrade($oldversion) {
     // Automatically generated Moodle v3.4.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

diff --git a/blocks/navigation/db/upgrade.php b/blocks/navigation/db/upgrade.php
index 07b4381..f6fca69 100644 (file)
--- a/blocks/navigation/db/upgrade.php
+++ b/blocks/navigation/db/upgrade.php
@@ -64,5 +64,8 @@ function xmldb_block_navigation_upgrade($oldversion, $block) {
     // Automatically generated Moodle v3.4.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

diff --git a/blocks/quiz_results/db/upgrade.php b/blocks/quiz_results/db/upgrade.php
index 18ee857..144a6d5 100644 (file)
--- a/blocks/quiz_results/db/upgrade.php
+++ b/blocks/quiz_results/db/upgrade.php
@@ -54,5 +54,8 @@ function xmldb_block_quiz_results_upgrade($oldversion, $block) {
     // Automatically generated Moodle v3.4.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

diff --git a/blocks/recent_activity/db/upgrade.php b/blocks/recent_activity/db/upgrade.php
index d9bf407..570c792 100644 (file)
--- a/blocks/recent_activity/db/upgrade.php
+++ b/blocks/recent_activity/db/upgrade.php
@@ -56,5 +56,8 @@ function xmldb_block_recent_activity_upgrade($oldversion, $block) {
     // Automatically generated Moodle v3.4.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

diff --git a/blocks/rss_client/db/upgrade.php b/blocks/rss_client/db/upgrade.php
index d968dda..c4888e8 100644 (file)
--- a/blocks/rss_client/db/upgrade.php
+++ b/blocks/rss_client/db/upgrade.php
@@ -42,5 +42,8 @@ function xmldb_block_rss_client_upgrade($oldversion) {
     // Automatically generated Moodle v3.4.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

diff --git a/blocks/section_links/db/upgrade.php b/blocks/section_links/db/upgrade.php
index 0200032..c8b43b7 100644 (file)
--- a/blocks/section_links/db/upgrade.php
+++ b/blocks/section_links/db/upgrade.php
@@ -58,5 +58,8 @@ function xmldb_block_section_links_upgrade($oldversion, $block) {
     // Automatically generated Moodle v3.4.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

diff --git a/blocks/selfcompletion/db/upgrade.php b/blocks/selfcompletion/db/upgrade.php
index 7e5e56a..285658f 100644 (file)
--- a/blocks/selfcompletion/db/upgrade.php
+++ b/blocks/selfcompletion/db/upgrade.php
@@ -57,5 +57,8 @@ function xmldb_block_selfcompletion_upgrade($oldversion, $block) {
     // Automatically generated Moodle v3.4.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

diff --git a/blocks/settings/db/upgrade.php b/blocks/settings/db/upgrade.php
index 2a9dceb..842c428 100644 (file)
--- a/blocks/settings/db/upgrade.php
+++ b/blocks/settings/db/upgrade.php
@@ -64,5 +64,8 @@ function xmldb_block_settings_upgrade($oldversion, $block) {
     // Automatically generated Moodle v3.4.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

diff --git a/course/classes/management_renderer.php b/course/classes/management_renderer.php
index 56e47e9..f66cd8c 100644 (file)
--- a/course/classes/management_renderer.php
+++ b/course/classes/management_renderer.php
@@ -484,9 +484,11 @@ class core_course_management_renderer extends plugin_renderer_base {
      * @param course_in_list $course The currently selected course.
      * @param int $page The page being displayed.
      * @param int $perpage The number of courses to display per page.
+     * @param string|null $viewmode The view mode the page is in, one out of 'default', 'combined', 'courses' or 'categories'.
      * @return string
      */
-    public function course_listing(coursecat $category = null, course_in_list $course = null, $page = 0, $perpage = 20) {
+    public function course_listing(coursecat $category = null, course_in_list $course = null, $page = 0, $perpage = 20,
+        $viewmode = 'default') {
 
         if ($category === null) {
             $html = html_writer::start_div('select-a-category');
@@ -527,13 +529,13 @@ class core_course_management_renderer extends plugin_renderer_base {
         $html .= html_writer::tag('h3', $category->get_formatted_name(),
             array('id' => 'course-listing-title', 'tabindex' => '0'));
         $html .= $this->course_listing_actions($category, $course, $perpage);
-        $html .= $this->listing_pagination($category, $page, $perpage);
+        $html .= $this->listing_pagination($category, $page, $perpage, false, $viewmode);
         $html .= html_writer::start_tag('ul', array('class' => 'ml-1 course-list', 'role' => 'group'));
         foreach ($category->get_courses($options) as $listitem) {
             $html .= $this->course_listitem($category, $listitem, $courseid);
         }
         $html .= html_writer::end_tag('ul');
-        $html .= $this->listing_pagination($category, $page, $perpage, true);
+        $html .= $this->listing_pagination($category, $page, $perpage, true, $viewmode);
         $html .= $this->course_bulk_actions($category);
         $html .= html_writer::end_div();
         return $html;
@@ -546,9 +548,10 @@ class core_course_management_renderer extends plugin_renderer_base {
      * @param int $page The current page.
      * @param int $perpage The number of courses to display per page.
      * @param bool $showtotals Set to true to show the total number of courses and what is being displayed.
+     * @param string|null $viewmode The view mode the page is in, one out of 'default', 'combined', 'courses' or 'categories'.
      * @return string
      */
-    protected function listing_pagination(coursecat $category, $page, $perpage, $showtotals = false) {
+    protected function listing_pagination(coursecat $category, $page, $perpage, $showtotals = false, $viewmode = 'default') {
         $html = '';
         $totalcourses = $category->get_courses_count();
         $totalpages = ceil($totalcourses / $perpage);
@@ -582,7 +585,12 @@ class core_course_management_renderer extends plugin_renderer_base {
             }
         }
         $items = array();
-        $baseurl = new moodle_url('/course/management.php', array('categoryid' => $category->id));
+        if ($viewmode !== 'default') {
+            $baseurl = new moodle_url('/course/management.php', array('categoryid' => $category->id,
+                'view' => $viewmode));
+        } else {
+            $baseurl = new moodle_url('/course/management.php', array('categoryid' => $category->id));
+        }
         if ($page > 0) {
             $items[] = $this->action_button(new moodle_url($baseurl, array('page' => 0)), get_string('first'));
             $items[] = $this->action_button(new moodle_url($baseurl, array('page' => $page - 1)), get_string('prev'));

diff --git a/course/format/topics/db/upgrade.php b/course/format/topics/db/upgrade.php
index 3f35b53..e4e4ac1 100644 (file)
--- a/course/format/topics/db/upgrade.php
+++ b/course/format/topics/db/upgrade.php
@@ -59,5 +59,8 @@ function xmldb_format_topics_upgrade($oldversion) {
         upgrade_plugin_savepoint(true, 2018030900, 'format', 'topics');
     }
 
+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

diff --git a/course/format/weeks/db/upgrade.php b/course/format/weeks/db/upgrade.php
index a68f713..893d716 100644 (file)
--- a/course/format/weeks/db/upgrade.php
+++ b/course/format/weeks/db/upgrade.php
@@ -95,5 +95,8 @@ function xmldb_format_weeks_upgrade($oldversion) {
         upgrade_plugin_savepoint(true, 2018030900, 'format', 'weeks');
     }
 
+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

diff --git a/course/management.php b/course/management.php
index 8c4d6ff..b083e28 100644 (file)
--- a/course/management.php
+++ b/course/management.php
@@ -495,7 +495,7 @@ if ($displaycategorylisting) {
 if ($displaycourselisting) {
     echo $renderer->grid_column_start($coursesize, 'course-listing');
     if (!$issearching) {
-        echo $renderer->course_listing($category, $course, $page, $perpage);
+        echo $renderer->course_listing($category, $course, $page, $perpage, $viewmode);
     } else {
         list($courses, $coursescount, $coursestotal) =
             \core_course\management\helper::search_courses($search, $blocklist, $modulelist, $page, $perpage);

diff --git a/enrol/database/db/upgrade.php b/enrol/database/db/upgrade.php
index 351cf66..38122c2 100644 (file)
--- a/enrol/database/db/upgrade.php
+++ b/enrol/database/db/upgrade.php
@@ -36,5 +36,8 @@ function xmldb_enrol_database_upgrade($oldversion) {
     // Automatically generated Moodle v3.4.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

diff --git a/enrol/flatfile/db/upgrade.php b/enrol/flatfile/db/upgrade.php
index 59ae42e..91590e5 100644 (file)
--- a/enrol/flatfile/db/upgrade.php
+++ b/enrol/flatfile/db/upgrade.php
@@ -36,5 +36,8 @@ function xmldb_enrol_flatfile_upgrade($oldversion) {
     // Automatically generated Moodle v3.4.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

diff --git a/enrol/guest/db/upgrade.php b/enrol/guest/db/upgrade.php
index cb6fb76..8785b4f 100644 (file)
--- a/enrol/guest/db/upgrade.php
+++ b/enrol/guest/db/upgrade.php
@@ -36,5 +36,8 @@ function xmldb_enrol_guest_upgrade($oldversion) {
     // Automatically generated Moodle v3.4.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

diff --git a/enrol/imsenterprise/db/upgrade.php b/enrol/imsenterprise/db/upgrade.php
index a4e1df7..bc6dd13 100644 (file)
--- a/enrol/imsenterprise/db/upgrade.php
+++ b/enrol/imsenterprise/db/upgrade.php
@@ -42,5 +42,8 @@ function xmldb_enrol_imsenterprise_upgrade($oldversion) {
     // Automatically generated Moodle v3.4.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

diff --git a/enrol/lti/db/upgrade.php b/enrol/lti/db/upgrade.php
index 353a7ad..aae9a1d 100644 (file)
--- a/enrol/lti/db/upgrade.php
+++ b/enrol/lti/db/upgrade.php
@@ -264,5 +264,8 @@ function xmldb_enrol_lti_upgrade($oldversion) {
     // Automatically generated Moodle v3.4.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

diff --git a/enrol/manual/db/upgrade.php b/enrol/manual/db/upgrade.php
index cec4ea4..4760dde 100644 (file)
--- a/enrol/manual/db/upgrade.php
+++ b/enrol/manual/db/upgrade.php
@@ -36,5 +36,8 @@ function xmldb_enrol_manual_upgrade($oldversion) {
     // Automatically generated Moodle v3.4.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

diff --git a/enrol/mnet/db/upgrade.php b/enrol/mnet/db/upgrade.php
index 6f22cca..d313c11 100644 (file)
--- a/enrol/mnet/db/upgrade.php
+++ b/enrol/mnet/db/upgrade.php
@@ -36,5 +36,8 @@ function xmldb_enrol_mnet_upgrade($oldversion) {
     // Automatically generated Moodle v3.4.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

diff --git a/enrol/paypal/db/upgrade.php b/enrol/paypal/db/upgrade.php
index bdbbbf6..ad195b1 100644 (file)
--- a/enrol/paypal/db/upgrade.php
+++ b/enrol/paypal/db/upgrade.php
@@ -54,5 +54,8 @@ function xmldb_enrol_paypal_upgrade($oldversion) {
     // Automatically generated Moodle v3.4.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

diff --git a/enrol/self/db/upgrade.php b/enrol/self/db/upgrade.php
index 4965298..d5e81ad 100644 (file)
--- a/enrol/self/db/upgrade.php
+++ b/enrol/self/db/upgrade.php
@@ -51,5 +51,8 @@ function xmldb_enrol_self_upgrade($oldversion) {
     // Automatically generated Moodle v3.4.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

diff --git a/filter/mathjaxloader/db/upgrade.php b/filter/mathjaxloader/db/upgrade.php
index 5294046..3080092 100644 (file)
--- a/filter/mathjaxloader/db/upgrade.php
+++ b/filter/mathjaxloader/db/upgrade.php
@@ -183,5 +183,8 @@ MathJax.Hub.Config({
     // Automatically generated Moodle v3.4.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

diff --git a/filter/mediaplugin/db/upgrade.php b/filter/mediaplugin/db/upgrade.php
index c89fab9..705aeaf 100644 (file)
--- a/filter/mediaplugin/db/upgrade.php
+++ b/filter/mediaplugin/db/upgrade.php
@@ -41,5 +41,8 @@ function xmldb_filter_mediaplugin_upgrade($oldversion) {
     // Automatically generated Moodle v3.4.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

diff --git a/filter/tex/db/upgrade.php b/filter/tex/db/upgrade.php
index 53cc010..7f85c8a 100644 (file)
--- a/filter/tex/db/upgrade.php
+++ b/filter/tex/db/upgrade.php
@@ -41,5 +41,8 @@ function xmldb_filter_tex_upgrade($oldversion) {
     // Automatically generated Moodle v3.4.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

diff --git a/grade/grading/form/guide/db/upgrade.php b/grade/grading/form/guide/db/upgrade.php
index 5677911..6566abf 100644 (file)
--- a/grade/grading/form/guide/db/upgrade.php
+++ b/grade/grading/form/guide/db/upgrade.php
@@ -46,5 +46,8 @@ function xmldb_gradingform_guide_upgrade($oldversion) {
     // Automatically generated Moodle v3.4.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

diff --git a/grade/grading/form/rubric/db/upgrade.php b/grade/grading/form/rubric/db/upgrade.php
index 92e65e3..1150ad0 100644 (file)
--- a/grade/grading/form/rubric/db/upgrade.php
+++ b/grade/grading/form/rubric/db/upgrade.php
@@ -42,5 +42,8 @@ function xmldb_gradingform_rubric_upgrade($oldversion) {
     // Automatically generated Moodle v3.4.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

diff --git a/grade/report/overview/db/upgrade.php b/grade/report/overview/db/upgrade.php
index b083ffb..7c212ca 100644 (file)
--- a/grade/report/overview/db/upgrade.php
+++ b/grade/report/overview/db/upgrade.php
@@ -48,5 +48,8 @@ function xmldb_gradereport_overview_upgrade($oldversion) {
     // Automatically generated Moodle v3.4.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

diff --git a/grade/report/user/db/upgrade.php b/grade/report/user/db/upgrade.php
index ea9d000..892e6b3 100644 (file)
--- a/grade/report/user/db/upgrade.php
+++ b/grade/report/user/db/upgrade.php
@@ -38,5 +38,8 @@ function xmldb_gradereport_user_upgrade($oldversion) {
     // Automatically generated Moodle v3.4.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

diff --git a/lib/antivirus/clamav/db/upgrade.php b/lib/antivirus/clamav/db/upgrade.php
index e1b678b..b0e6493 100644 (file)
--- a/lib/antivirus/clamav/db/upgrade.php
+++ b/lib/antivirus/clamav/db/upgrade.php
@@ -57,5 +57,8 @@ function xmldb_antivirus_clamav_upgrade($oldversion) {
     // Automatically generated Moodle v3.4.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

diff --git a/lib/behat/classes/behat_config_util.php b/lib/behat/classes/behat_config_util.php
index 1546d0b..e393580 100644 (file)
--- a/lib/behat/classes/behat_config_util.php
+++ b/lib/behat/classes/behat_config_util.php
@@ -672,7 +672,7 @@ class behat_config_util {
     public function profile_guided_allocate($features, $nbuckets, $instance) {
 
         // No profile guided allocation is required in phpunit.
-        if (defined('PHPUNIT_TEST')) {
+        if (defined('PHPUNIT_TEST') && PHPUNIT_TEST) {
             return false;
         }
 
@@ -725,7 +725,8 @@ class behat_config_util {
             $totalweight += $weight;
         }
 
-        if ($totalweight && !defined('BEHAT_DISABLE_HISTOGRAM') && $instance == $nbuckets && !defined('PHPUNIT_TEST')) {
+        if ($totalweight && !defined('BEHAT_DISABLE_HISTOGRAM') && $instance == $nbuckets
+                && (!defined('PHPUNIT_TEST') || !PHPUNIT_TEST)) {
             echo "Bucket weightings:\n";
             foreach ($weights as $k => $weight) {
                 echo $k + 1 . ": " . str_repeat('*', 70 * $nbuckets * $weight / $totalweight) . PHP_EOL;
@@ -960,7 +961,7 @@ class behat_config_util {
                 unset($features[$key]);
             } else {
                 $featurestocheck = $this->get_components_features();
-                if (!isset($featurestocheck[$key]) && !defined('PHPUNIT_TEST')) {
+                if (!isset($featurestocheck[$key]) && (!defined('PHPUNIT_TEST') || !PHPUNIT_TEST)) {
                     behat_error(BEHAT_EXITCODE_REQUIREMENT, 'Blacklisted feature "' . $blacklistpath . '" not found.');
                 }
             }

diff --git a/lib/classes/oauth2/api.php b/lib/classes/oauth2/api.php
index b10af6c..72d4e97 100644 (file)
--- a/lib/classes/oauth2/api.php
+++ b/lib/classes/oauth2/api.php
@@ -349,7 +349,7 @@ class api {
      * @param \core\oauth2\issuer $issuer The desired OAuth issuer
      */
     protected static function guess_image($issuer) {
-        if (empty($issuer->get('image'))) {
+        if (empty($issuer->get('image')) && !empty($issuer->get('baseurl'))) {
             $baseurl = parse_url($issuer->get('baseurl'));
             $imageurl = $baseurl['scheme'] . '://' . $baseurl['host'] . '/favicon.ico';
             $issuer->set('image', $imageurl);

diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php
index 55b0a23..cc7edbd 100644 (file)
--- a/lib/db/upgrade.php
+++ b/lib/db/upgrade.php
@@ -2230,5 +2230,8 @@ function xmldb_main_upgrade($oldversion) {
         upgrade_main_savepoint(true, 2018050900.01);
     }
 
+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

diff --git a/lib/ddl/mysql_sql_generator.php b/lib/ddl/mysql_sql_generator.php
index 1933f69..e9f4418 100644 (file)
--- a/lib/ddl/mysql_sql_generator.php
+++ b/lib/ddl/mysql_sql_generator.php
@@ -321,6 +321,27 @@ class mysql_sql_generator extends sql_generator {
         return $sqls;
     }
 
+    public function getAlterFieldSQL($xmldb_table, $xmldb_field, $skip_type_clause = NULL, $skip_default_clause = NULL, $skip_notnull_clause = NULL)
+    {
+        $tablename = $xmldb_table->getName();
+        $dbcolumnsinfo = $this->mdb->get_columns($tablename);
+
+        if (($this->mdb->has_breaking_change_sqlmode()) &&
+            ($dbcolumnsinfo[$xmldb_field->getName()]->meta_type == 'X') &&
+            ($xmldb_field->getType() == XMLDB_TYPE_INTEGER)) {
+            // Ignore 1292 ER_TRUNCATED_WRONG_VALUE Truncated incorrect INTEGER value: '%s'.
+            $altercolumnsqlorig = $this->alter_column_sql;
+            $this->alter_column_sql = str_replace('ALTER TABLE', 'ALTER IGNORE TABLE', $this->alter_column_sql);
+            $result = parent::getAlterFieldSQL($xmldb_table, $xmldb_field, $skip_type_clause, $skip_default_clause, $skip_notnull_clause);
+            // Restore the original ALTER SQL statement pattern.
+            $this->alter_column_sql = $altercolumnsqlorig;
+
+            return $result;
+        }
+
+        return parent::getAlterFieldSQL($xmldb_table, $xmldb_field, $skip_type_clause, $skip_default_clause, $skip_notnull_clause);
+    }
+
     /**
      * Given one correct xmldb_table, returns the SQL statements
      * to create temporary table (inside one array).

diff --git a/lib/dml/mariadb_native_moodle_database.php b/lib/dml/mariadb_native_moodle_database.php
index c333222..358a493 100644 (file)
--- a/lib/dml/mariadb_native_moodle_database.php
+++ b/lib/dml/mariadb_native_moodle_database.php
@@ -94,6 +94,12 @@ class mariadb_native_moodle_database extends mysqli_native_moodle_database {
         return version_compare($version, '10.2.7', '>=');
     }
 
+    public function has_breaking_change_sqlmode() {
+        $version = $this->get_server_info()['version'];
+        // Breaking change since 10.2.4: https://mariadb.com/kb/en/the-mariadb-library/sql-mode/#setting-sql_mode.
+        return version_compare($version, '10.2.4', '>=');
+    }
+
     /**
      * It is time to require transactions everywhere.
      *

diff --git a/lib/dml/mysqli_native_moodle_database.php b/lib/dml/mysqli_native_moodle_database.php
index 015d3a6..c3e2e66 100644 (file)
--- a/lib/dml/mysqli_native_moodle_database.php
+++ b/lib/dml/mysqli_native_moodle_database.php
@@ -817,6 +817,14 @@ class mysqli_native_moodle_database extends moodle_database {
         return false;
     }
 
+    /**
+     * Indicates whether SQL_MODE default value has changed in a not backward compatible way.
+     * @return boolean True when SQL_MODE breaks BC; otherwise, false.
+     */
+    public function has_breaking_change_sqlmode() {
+        return false;
+    }
+
     /**
      * Returns moodle column info for raw column from information schema.
      * @param stdClass $rawcolumn

diff --git a/lib/editor/atto/db/upgrade.php b/lib/editor/atto/db/upgrade.php
index c663679..1ae13a6 100644 (file)
--- a/lib/editor/atto/db/upgrade.php
+++ b/lib/editor/atto/db/upgrade.php
@@ -97,5 +97,8 @@ function xmldb_editor_atto_upgrade($oldversion) {
         upgrade_plugin_savepoint(true, 2018051401, 'editor', 'atto');
     }
 
+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

diff --git a/lib/editor/atto/plugins/equation/db/upgrade.php b/lib/editor/atto/plugins/equation/db/upgrade.php
index efe6f10..e13eedb 100644 (file)
--- a/lib/editor/atto/plugins/equation/db/upgrade.php
+++ b/lib/editor/atto/plugins/equation/db/upgrade.php
@@ -41,5 +41,8 @@ function xmldb_atto_equation_upgrade($oldversion) {
     // Automatically generated Moodle v3.4.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

diff --git a/lib/editor/tinymce/db/upgrade.php b/lib/editor/tinymce/db/upgrade.php
index 6f8f80f..d0e949e 100644 (file)
--- a/lib/editor/tinymce/db/upgrade.php
+++ b/lib/editor/tinymce/db/upgrade.php
@@ -36,5 +36,8 @@ function xmldb_editor_tinymce_upgrade($oldversion) {
     // Automatically generated Moodle v3.4.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

diff --git a/lib/editor/tinymce/plugins/spellchecker/db/upgrade.php b/lib/editor/tinymce/plugins/spellchecker/db/upgrade.php
index a56ffb4..006a66f 100644 (file)
--- a/lib/editor/tinymce/plugins/spellchecker/db/upgrade.php
+++ b/lib/editor/tinymce/plugins/spellchecker/db/upgrade.php
@@ -36,5 +36,8 @@ function xmldb_tinymce_spellchecker_upgrade($oldversion) {
     // Automatically generated Moodle v3.4.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

diff --git a/lib/editor/tinymce/readme_moodle.txt b/lib/editor/tinymce/readme_moodle.txt
index 429c5d0..b209e7c 100644 (file)
--- a/lib/editor/tinymce/readme_moodle.txt
+++ b/lib/editor/tinymce/readme_moodle.txt
@@ -16,9 +16,10 @@ Upgrade procedure:
 5/ execute cli/update_lang_files.php and review changes in lang/en/editor_tinymce.php
 
 Changes:
-lib/editor/tinymce/tiny_mce/3.5.11/plugins/fullscreen/editor_plugin_src.js:31-33 - Added checks to see if required functions exist.
-After these changes you need to use uglifier to compress the js into lib/editor/tinymce/tiny_mce/3.5.11/plugins/fullscreen/editor_plugin.js
-(I used "uglifyjs editor_plugin_src.js -c -m -v -o editor_plugin.js")
+- MDL-62381 - Icon sizing is being overwritten on images.
+- lib/editor/tinymce/tiny_mce/3.5.11/plugins/fullscreen/editor_plugin_src.js:31-33 - Added checks to see if required functions exist.
+  After these changes you need to use uglifier to compress the js into lib/editor/tinymce/tiny_mce/3.5.11/plugins/fullscreen/editor_plugin.js
+  (I used "uglifyjs editor_plugin_src.js -c -m -v -o editor_plugin.js")
 
 Copy the moodle skin to the new version:
 lib/editor/tinymce/tiny_mce/3.5.10/theme/advanced/skins/moodle/

diff --git a/lib/editor/tinymce/tiny_mce/3.5.11/themes/advanced/skins/moodle/ui.css b/lib/editor/tinymce/tiny_mce/3.5.11/themes/advanced/skins/moodle/ui.css
index f7e0741..934ac45 100644 (file)
--- a/lib/editor/tinymce/tiny_mce/3.5.11/themes/advanced/skins/moodle/ui.css
+++ b/lib/editor/tinymce/tiny_mce/3.5.11/themes/advanced/skins/moodle/ui.css
@@ -80,7 +80,7 @@
 .moodleSkin .mceToolbar .mceToolbarStart span, .moodleSkin .mceToolbar .mceToolbarEnd span {display:none;}
 .moodleSkin .mceToolbar .mceToolbarEndListBox span, .moodleSkin .mceToolbar .mceToolbarStartListBox span {display:none}
 .moodleSkin span.mceIcon {display:block;}
-.moodleSkin img.mceIcon {display:block; width:16px; height:16px; padding: 2px 0 0 2px;}
+.moodleSkin img.mceIcon:not(img) {display:block; width:16px; height:16px; padding: 2px 0 0 2px;}
 .moodleSkin td.mceCenter {text-align:center;}
 .moodleSkin td.mceCenter table {margin:0 auto; text-align:left;}
 .moodleSkin td.mceRight table {margin:0 0 0 auto;}

diff --git a/lib/ltiprovider/readme_moodle.txt b/lib/ltiprovider/readme_moodle.txt
index d36fe17..9b3b1b8 100644 (file)
--- a/lib/ltiprovider/readme_moodle.txt
+++ b/lib/ltiprovider/readme_moodle.txt
@@ -5,9 +5,11 @@ Some changes from the upstream version have been made:
 * Define consumer profile member variable for ToolConsumer class
 * Added context type property for Context class
 * Set context type if 'context_type' parameter was submitted through POST
-These changes can be reverted once the following pull requests have been integrated upstream:
+* Do not require tool_consumer_instance_guid
+These changes can be reverted once the following pull requests/issues have been integrated upstream:
 * https://github.com/IMSGlobal/LTI-Tool-Provider-Library-PHP/pull/10/commits/a9a1641f1a593eba4638133245c21d9ad47d8680
 * https://github.com/IMSGlobal/LTI-Tool-Provider-Library-PHP/pull/11/commits/0bae60389bd020a02be5554516b86336e651e237
+* https://github.com/IMSGlobal/LTI-Tool-Provider-Library-PHP/issues/19
 
 It is recommended by upstream to install depdencies via composer - but the composer installation is bundled
 with an autoloader so it's better to do it manually.

diff --git a/lib/ltiprovider/src/ToolProvider/ToolProvider.php b/lib/ltiprovider/src/ToolProvider/ToolProvider.php
index 27cbd6e..8994eff 100644 (file)
--- a/lib/ltiprovider/src/ToolProvider/ToolProvider.php
+++ b/lib/ltiprovider/src/ToolProvider/ToolProvider.php
@@ -808,11 +808,6 @@ EOD;
                         if (!$this->ok) {
                             $this->reason = 'Request is from an invalid tool consumer.';
                         }
-                    } else {
-                        $this->ok = isset($_POST['tool_consumer_instance_guid']);
-                        if (!$this->ok) {
-                            $this->reason = 'A tool consumer GUID must be included in the launch request.';
-                        }
                     }
                 }
                 if ($this->ok) {

diff --git a/lib/templates/single_select.mustache b/lib/templates/single_select.mustache
index 90e936a..3994c78 100644 (file)
--- a/lib/templates/single_select.mustache
+++ b/lib/templates/single_select.mustache
@@ -110,7 +110,7 @@
             {{/options}}
         </select>
         <noscript>
-            <input type="submit" role="button" class="btn btn-secondary" value="{{#str}}go, core{{/str}}">
+            <input type="submit" class="btn btn-secondary" value="{{#str}}go, core{{/str}}">
         </noscript>
     </form>
 </div>

diff --git a/message/output/email/db/upgrade.php b/message/output/email/db/upgrade.php
index cf94659..62ecec8 100644 (file)
--- a/message/output/email/db/upgrade.php
+++ b/message/output/email/db/upgrade.php
@@ -41,5 +41,8 @@ function xmldb_message_email_upgrade($oldversion) {
     // Automatically generated Moodle v3.4.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

diff --git a/message/output/jabber/db/upgrade.php b/message/output/jabber/db/upgrade.php
index 616e44d..b097f75 100644 (file)
--- a/message/output/jabber/db/upgrade.php
+++ b/message/output/jabber/db/upgrade.php
@@ -41,5 +41,8 @@ function xmldb_message_jabber_upgrade($oldversion) {
     // Automatically generated Moodle v3.4.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

diff --git a/message/output/popup/amd/build/notification_popover_controller.min.js b/message/output/popup/amd/build/notification_popover_controller.min.js
index 00e7537..4d099a4 100644 (file)
Binary files a/message/output/popup/amd/build/notification_popover_controller.min.js and b/message/output/popup/amd/build/notification_popover_controller.min.js differ

diff --git a/message/output/popup/amd/src/notification_popover_controller.js b/message/output/popup/amd/src/notification_popover_controller.js
index 62af012..de45501 100644 (file)
--- a/message/output/popup/amd/src/notification_popover_controller.js
+++ b/message/output/popup/amd/src/notification_popover_controller.js
@@ -237,6 +237,12 @@ define(['jquery', 'core/ajax', 'core/templates', 'core/str', 'core/url',
                 offset: offset,
             });
 
+            // Link to mark read page before loading the actual link.
+            notification.contexturl = URL.relativeUrl('message/output/popup/mark_notification_read.php', {
+                redirecturl: notification.contexturl,
+                notificationid: notification.id,
+            });
+
             var promise = Templates.render('message_popup/notification_content_item', notification)
             .then(function(html, js) {
                 return {html: html, js: js};
@@ -321,26 +327,6 @@ define(['jquery', 'core/ajax', 'core/templates', 'core/str', 'core/url',
             }.bind(this));
     };
 
-    /**
-     * Send a request to the server to mark a single notification as read and update
-     * the unread count and unread notification elements appropriately.
-     *
-     * @param {jQuery} element
-     * @return {Promise|boolean}
-     * @method markAllAsRead
-     */
-    NotificationPopoverController.prototype.markNotificationAsRead = function(element) {
-        if (!element.hasClass('unread')) {
-            return false;
-        }
-
-        return NotificationRepo.markAsRead(element.attr('data-id'))
-            .then(function() {
-                this.unreadCount--;
-                element.removeClass('unread');
-            }.bind(this));
-    };
-
     /**
      * Add all of the required event listeners for this notification popover.
      *
@@ -361,7 +347,12 @@ define(['jquery', 'core/ajax', 'core/templates', 'core/str', 'core/url',
         // Mark individual notification read if the user activates it.
         this.root.on(CustomEvents.events.activate, SELECTORS.NOTIFICATION_LINK, function(e) {
             var element = $(e.target).closest(SELECTORS.NOTIFICATION);
-            this.markNotificationAsRead(element);
+
+            if (element.hasClass('unread')) {
+                this.unreadCount--;
+                element.removeClass('unread');
+            }
+
             e.stopPropagation();
         }.bind(this));
 

diff --git a/message/output/popup/db/upgrade.php b/message/output/popup/db/upgrade.php
index 3ae0a42..b5d1f7b 100644 (file)
--- a/message/output/popup/db/upgrade.php
+++ b/message/output/popup/db/upgrade.php
@@ -104,5 +104,8 @@ function xmldb_message_popup_upgrade($oldversion) {
         upgrade_plugin_savepoint(true, 2018032800, 'message', 'popup');
     }
 
+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

diff --git a/message/output/popup/mark_notification_read.php b/message/output/popup/mark_notification_read.php
new file mode 100644 (file)
index 0000000..0d393f4
--- /dev/null
+++ b/message/output/popup/mark_notification_read.php
@@ -0,0 +1,43 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Mark a notification read and redirect to the relevant content.
+ *
+ * @package    message_popup
+ * @copyright  2018 Michael Hawkins
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+require_once(__DIR__ . '/../../../config.php');
+
+require_login(null, false);
+
+if (isguestuser()) {
+    redirect($CFG->wwwroot);
+}
+
+$notificationid = required_param('notificationid', PARAM_INT);
+$redirecturl = optional_param('redirecturl', $CFG->wwwroot, PARAM_LOCALURL);
+$notification = $DB->get_record('notifications', array('id' => $notificationid));
+
+// Check notification belongs to this user.
+if ($USER->id != $notification->useridto) {
+    redirect($CFG->wwwroot);
+}
+
+\core_message\api::mark_notification_as_read($notification);
+redirect($redirecturl);

diff --git a/mod/assign/db/upgrade.php b/mod/assign/db/upgrade.php
index 013eaa0..9908d99 100644 (file)
--- a/mod/assign/db/upgrade.php
+++ b/mod/assign/db/upgrade.php
@@ -168,5 +168,8 @@ function xmldb_assign_upgrade($oldversion) {
     // Automatically generated Moodle v3.4.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

diff --git a/mod/assign/feedback/comments/db/upgrade.php b/mod/assign/feedback/comments/db/upgrade.php
index 0288554..1455b71 100644 (file)
--- a/mod/assign/feedback/comments/db/upgrade.php
+++ b/mod/assign/feedback/comments/db/upgrade.php
@@ -41,5 +41,8 @@ function xmldb_assignfeedback_comments_upgrade($oldversion) {
     // Automatically generated Moodle v3.4.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

diff --git a/mod/assign/feedback/editpdf/db/upgrade.php b/mod/assign/feedback/editpdf/db/upgrade.php
index 18d5c3b..995afce 100644 (file)
--- a/mod/assign/feedback/editpdf/db/upgrade.php
+++ b/mod/assign/feedback/editpdf/db/upgrade.php
@@ -59,5 +59,8 @@ function xmldb_assignfeedback_editpdf_upgrade($oldversion) {
     // Automatically generated Moodle v3.4.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

diff --git a/mod/assign/feedback/file/db/upgrade.php b/mod/assign/feedback/file/db/upgrade.php
index 81c791f..e142217 100644 (file)
--- a/mod/assign/feedback/file/db/upgrade.php
+++ b/mod/assign/feedback/file/db/upgrade.php
@@ -41,5 +41,8 @@ function xmldb_assignfeedback_file_upgrade($oldversion) {
     // Automatically generated Moodle v3.4.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

diff --git a/mod/assign/submission/comments/db/upgrade.php b/mod/assign/submission/comments/db/upgrade.php
index 46dafbe..a8b584f 100644 (file)
--- a/mod/assign/submission/comments/db/upgrade.php
+++ b/mod/assign/submission/comments/db/upgrade.php
@@ -41,5 +41,8 @@ function xmldb_assignsubmission_comments_upgrade($oldversion) {
     // Automatically generated Moodle v3.4.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

diff --git a/mod/assign/submission/file/db/upgrade.php b/mod/assign/submission/file/db/upgrade.php
index 69b2dbb..38d416f 100644 (file)
--- a/mod/assign/submission/file/db/upgrade.php
+++ b/mod/assign/submission/file/db/upgrade.php
@@ -41,5 +41,8 @@ function xmldb_assignsubmission_file_upgrade($oldversion) {
     // Automatically generated Moodle v3.4.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

diff --git a/mod/assign/submission/onlinetext/db/upgrade.php b/mod/assign/submission/onlinetext/db/upgrade.php
index 4fddf2d..22b8420 100644 (file)
--- a/mod/assign/submission/onlinetext/db/upgrade.php
+++ b/mod/assign/submission/onlinetext/db/upgrade.php
@@ -41,5 +41,8 @@ function xmldb_assignsubmission_onlinetext_upgrade($oldversion) {
     // Automatically generated Moodle v3.4.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

diff --git a/mod/assignment/db/upgrade.php b/mod/assignment/db/upgrade.php
index 0e633a5..0555bbb 100644 (file)
--- a/mod/assignment/db/upgrade.php
+++ b/mod/assignment/db/upgrade.php
@@ -33,5 +33,8 @@ function xmldb_assignment_upgrade($oldversion) {
     // Automatically generated Moodle v3.4.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

diff --git a/mod/book/db/upgrade.php b/mod/book/db/upgrade.php
index 6437d3e..9afd362 100644 (file)
--- a/mod/book/db/upgrade.php
+++ b/mod/book/db/upgrade.php
@@ -41,5 +41,8 @@ function xmldb_book_upgrade($oldversion) {
     // Automatically generated Moodle v3.4.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

diff --git a/mod/chat/db/upgrade.php b/mod/chat/db/upgrade.php
index 0d41bac..6db7f12 100644 (file)
--- a/mod/chat/db/upgrade.php
+++ b/mod/chat/db/upgrade.php
@@ -65,5 +65,8 @@ function xmldb_chat_upgrade($oldversion) {
         upgrade_mod_savepoint(true, 2017111301, 'chat');
     }
 
+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

diff --git a/mod/choice/db/upgrade.php b/mod/choice/db/upgrade.php
index 82136fb..f539254 100644 (file)
--- a/mod/choice/db/upgrade.php
+++ b/mod/choice/db/upgrade.php
@@ -33,5 +33,8 @@ function xmldb_choice_upgrade($oldversion) {
     // Automatically generated Moodle v3.4.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

diff --git a/mod/data/db/upgrade.php b/mod/data/db/upgrade.php
index 7287381..0453408 100644 (file)
--- a/mod/data/db/upgrade.php
+++ b/mod/data/db/upgrade.php
@@ -65,5 +65,8 @@ function xmldb_data_upgrade($oldversion) {
     // Automatically generated Moodle v3.4.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

diff --git a/mod/feedback/db/upgrade.php b/mod/feedback/db/upgrade.php
index 46e9696..849d438 100644 (file)
--- a/mod/feedback/db/upgrade.php
+++ b/mod/feedback/db/upgrade.php
@@ -78,5 +78,8 @@ function xmldb_feedback_upgrade($oldversion) {
     // Automatically generated Moodle v3.4.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

diff --git a/mod/folder/db/upgrade.php b/mod/folder/db/upgrade.php
index aca1bb1..a9fc7b7 100644 (file)
--- a/mod/folder/db/upgrade.php
+++ b/mod/folder/db/upgrade.php
@@ -58,5 +58,8 @@ function xmldb_folder_upgrade($oldversion) {
     // Automatically generated Moodle v3.4.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

diff --git a/mod/forum/db/upgrade.php b/mod/forum/db/upgrade.php
index d8961fd..a0adbb8 100644 (file)
--- a/mod/forum/db/upgrade.php
+++ b/mod/forum/db/upgrade.php
@@ -116,5 +116,8 @@ function xmldb_forum_upgrade($oldversion) {
         upgrade_mod_savepoint(true, 2018032900, 'forum');
     }
 
+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

diff --git a/mod/forum/rsslib.php b/mod/forum/rsslib.php
index f360627..5b30243 100644 (file)
--- a/mod/forum/rsslib.php
+++ b/mod/forum/rsslib.php
@@ -189,7 +189,7 @@ function forum_rss_feed_discussions_sql($forum, $cm, $newsince=0) {
               FROM {forum_discussions} d
                    JOIN {forum_posts} p ON p.discussion = d.id
                    JOIN {user} u ON p.userid = u.id
-             WHERE d.forum = {$forum->id} AND p.parent = 0 AND p.deleted <> 0
+             WHERE d.forum = {$forum->id} AND p.parent = 0 AND p.deleted <> 1
                    $timelimit $groupselect $newsince
           ORDER BY $forumsort";
     return array($sql, $params);
@@ -243,7 +243,7 @@ function forum_rss_feed_posts_sql($forum, $cm, $newsince=0) {
                {forum_posts} p,
                {user} u
             WHERE d.forum = {$forum->id} AND
-                p.discussion = d.id AND p.deleted <> 0 AND
+                p.discussion = d.id AND p.deleted <> 1 AND
                 u.id = p.userid $newsince
                 $groupselect
             ORDER BY p.created desc";

diff --git a/mod/forum/tests/rsslib_test.php b/mod/forum/tests/rsslib_test.php
new file mode 100644 (file)
index 0000000..8b0e362
--- /dev/null
+++ b/mod/forum/tests/rsslib_test.php
@@ -0,0 +1,102 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Tests for the forum implementation of the RSS component.
+ *
+ * @package    mod_forum
+ * @copyright  2018 Andrew Nicols <andrew@nicols.co.uk>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+global $CFG;
+require_once(__DIR__ . '/helper.php');
+require_once("{$CFG->dirroot}/mod/forum/rsslib.php");
+
+/**
+ * Tests for the forum implementation of the RSS component.
+ *
+ * @copyright  2018 Andrew Nicols <andrew@nicols.co.uk>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class mod_forum_rsslib_testcase extends advanced_testcase {
+    // Include the mod_forum test helpers.
+    // This includes functions to create forums, users, discussions, and posts.
+    use helper;
+
+    /**
+     * Ensure that deleted posts are not included.
+     */
+    public function test_forum_rss_feed_discussions_sql_respect_deleted() {
+        global $DB;
+
+        $this->resetAfterTest();
+
+        $course = $this->getDataGenerator()->create_course();
+        $forum = $this->getDataGenerator()->create_module('forum', ['course' => $course->id]);
+        $cm = get_coursemodule_from_instance('forum', $forum->id);
+
+        list($user, $otheruser) = $this->helper_create_users($course, 2);
+
+        // Post twice.
+        $this->helper_post_to_forum($forum, $otheruser);
+        list($discussion, $post) = $this->helper_post_to_forum($forum, $otheruser);
+
+        list($sql, $params) = forum_rss_feed_discussions_sql($forum, $cm);
+        $discussions = $DB->get_records_sql($sql, $params);
+        $this->assertCount(2, $discussions);
+
+        $post->deleted = 1;
+        $DB->update_record('forum_posts', $post);
+
+        list($sql, $params) = forum_rss_feed_discussions_sql($forum, $cm);
+        $discussions = $DB->get_records_sql($sql, $params);
+        $this->assertCount(1, $discussions);
+    }
+
+
+    /**
+     * Ensure that deleted posts are not included.
+     */
+    public function test_forum_rss_feed_posts_sql_respect_deleted() {
+        global $DB;
+
+        $this->resetAfterTest();
+
+        $course = $this->getDataGenerator()->create_course();
+        $forum = $this->getDataGenerator()->create_module('forum', ['course' => $course->id]);
+        $cm = get_coursemodule_from_instance('forum', $forum->id);
+
+        list($user, $otheruser) = $this->helper_create_users($course, 2);
+
+        // Post twice.
+        $this->helper_post_to_forum($forum, $otheruser);
+        list($discussion, $post) = $this->helper_post_to_forum($forum, $otheruser);
+
+        list($sql, $params) = forum_rss_feed_posts_sql($forum, $cm);
+        $posts = $DB->get_records_sql($sql, $params);
+        $this->assertCount(2, $posts);
+
+        $post->deleted = 1;
+        $DB->update_record('forum_posts', $post);
+
+        list($sql, $params) = forum_rss_feed_posts_sql($forum, $cm);
+        $posts = $DB->get_records_sql($sql, $params);
+        $this->assertCount(1, $posts);
+    }
+}

diff --git a/mod/glossary/db/upgrade.php b/mod/glossary/db/upgrade.php
index e3b645c..cc92bda 100644 (file)
--- a/mod/glossary/db/upgrade.php
+++ b/mod/glossary/db/upgrade.php
@@ -31,6 +31,9 @@ function xmldb_glossary_upgrade($oldversion) {
     // Automatically generated Moodle v3.4.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
     if ($oldversion < 2018051401) {
 
         // Fetch the module ID for the glossary module.

diff --git a/mod/imscp/db/upgrade.php b/mod/imscp/db/upgrade.php
index ff169ec..6a8d756 100644 (file)
--- a/mod/imscp/db/upgrade.php
+++ b/mod/imscp/db/upgrade.php
@@ -40,5 +40,8 @@ function xmldb_imscp_upgrade($oldversion) {
     // Automatically generated Moodle v3.4.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

diff --git a/mod/label/db/upgrade.php b/mod/label/db/upgrade.php
index cb877fe..62a61ae 100644 (file)
--- a/mod/label/db/upgrade.php
+++ b/mod/label/db/upgrade.php
@@ -67,5 +67,8 @@ function xmldb_label_upgrade($oldversion) {
     // Automatically generated Moodle v3.4.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

diff --git a/mod/lesson/db/upgrade.php b/mod/lesson/db/upgrade.php
index 8ab0f02..86afb89 100644 (file)
--- a/mod/lesson/db/upgrade.php
+++ b/mod/lesson/db/upgrade.php
@@ -107,5 +107,8 @@ function xmldb_lesson_upgrade($oldversion) {
     // Automatically generated Moodle v3.4.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

diff --git a/mod/lesson/renderer.php b/mod/lesson/renderer.php
index b0e35c0..a5a03c2 100644 (file)
--- a/mod/lesson/renderer.php
+++ b/mod/lesson/renderer.php
@@ -282,11 +282,10 @@ class mod_lesson_renderer extends plugin_renderer_base {
             $pagetable->cellspacing = 0;
             $pagetable->cellpadding = '5px';
             $pagetable->data = array();
-            $pagetable->id = 'lesson-' . $pageid;
 
             $pageheading = new html_table_cell();
 
-            $pageheading->text = format_string($page->title);
+            $pageheading->text = html_writer::tag('a', '', array('id' => 'lesson-' . $pageid)) . format_string($page->title);
             if ($canedit) {
                 $pageheading->text .= ' '.$this->page_action_links($page, $npages);
             }
@@ -309,7 +308,7 @@ class mod_lesson_renderer extends plugin_renderer_base {
 
             $pagetable = $page->display_answers($pagetable);
 
-            $content .= html_writer::start_tag('div', array('class' => 'no-overflow'));
+            $content .= html_writer::start_tag('div');
             $content .= html_writer::table($pagetable);
             $content .= html_writer::end_tag('div');
 

diff --git a/mod/lesson/tests/behat/lesson_delete_answers.feature b/mod/lesson/tests/behat/lesson_delete_answers.feature
index 787529f..cafef68 100644 (file)
--- a/mod/lesson/tests/behat/lesson_delete_answers.feature
+++ b/mod/lesson/tests/behat/lesson_delete_answers.feature
@@ -50,7 +50,7 @@ branch table contents
     And I follow "Expanded"
 
   Scenario: Edit lesson content page
-    Given I click on "//th[normalize-space(.)='First page name']/descendant::a[2]" "xpath_element"
+    Given I click on "//th[normalize-space(.)='First page name']/descendant::a[3]" "xpath_element"
     When I set the following fields to these values:
       | id_answer_editor_1 | |
     And I press "Save page"
@@ -73,7 +73,7 @@ branch table contents
     And I should see "Your score is 1 (out of 1)."
 
   Scenario: Edit lesson question page
-    Given I click on "//th[normalize-space(.)='Hardest question ever']/descendant::a[2]" "xpath_element"
+    Given I click on "//th[normalize-space(.)='Hardest question ever']/descendant::a[3]" "xpath_element"
     When I set the following fields to these values:
       | id_answer_editor_1 | |
     And I press "Save page"

diff --git a/mod/lesson/tests/behat/lesson_edit_cluster.feature b/mod/lesson/tests/behat/lesson_edit_cluster.feature
index b687083..58c7209 100644 (file)
--- a/mod/lesson/tests/behat/lesson_edit_cluster.feature
+++ b/mod/lesson/tests/behat/lesson_edit_cluster.feature
@@ -71,16 +71,16 @@ Feature: In a lesson activity, teacher can edit a cluster page
     And I press "Save page"
 
   Scenario: Edit lesson cluster page
-    Given I click on "//th[normalize-space(.)='Cluster']/descendant::a[2]" "xpath_element"
+    Given I click on "//th[normalize-space(.)='Cluster']/descendant::a[3]" "xpath_element"
     When I set the following fields to these values:
       | Page title | Modified name |
       | Page contents | Modified contents |
     And I press "Save page"
     Then I should see "Modified name"
-    And I click on "//th[normalize-space(.)='Modified name']/descendant::a[2]" "xpath_element"
+    And I click on "//th[normalize-space(.)='Modified name']/descendant::a[3]" "xpath_element"
     And I should see "Unseen question within a cluster"
     And I press "Cancel"
-    And I click on "//th[normalize-space(.)='End of cluster']/descendant::a[2]" "xpath_element"
+    And I click on "//th[normalize-space(.)='End of cluster']/descendant::a[3]" "xpath_element"
     And I set the following fields to these values:
       | Page title | Modified end |
       | Page contents | Modified end contents |

diff --git a/mod/lesson/tests/behat/lesson_edit_pages.feature b/mod/lesson/tests/behat/lesson_edit_pages.feature
index 2026ec0..188a628 100644 (file)
--- a/mod/lesson/tests/behat/lesson_edit_pages.feature
+++ b/mod/lesson/tests/behat/lesson_edit_pages.feature
@@ -56,7 +56,7 @@ Feature: In a lesson activity, teacher can edit lesson's pages
     And I press "Save page"
 
   Scenario: Edit lesson content page
-    Given I click on "//th[normalize-space(.)='Second page name']/descendant::a[2]" "xpath_element"
+    Given I click on "//th[normalize-space(.)='Second page name']/descendant::a[3]" "xpath_element"
     When I set the following fields to these values:
       | Page title | Modified second page |
       | Page contents | Modified contents |
@@ -91,7 +91,7 @@ Feature: In a lesson activity, teacher can edit lesson's pages
     And I should see "Your score is 1 (out of 1)."
 
   Scenario: Edit lesson question page
-    Given I click on "//th[normalize-space(.)='Hardest question ever']/descendant::a[2]" "xpath_element"
+    Given I click on "//th[normalize-space(.)='Hardest question ever']/descendant::a[3]" "xpath_element"
     When I set the following fields to these values:
       | Page title | New hardest question |
       | Page contents | 1 + 2? |

diff --git a/mod/lti/db/upgrade.php b/mod/lti/db/upgrade.php
index 605b00c..76642f5 100644 (file)
--- a/mod/lti/db/upgrade.php
+++ b/mod/lti/db/upgrade.php
@@ -137,6 +137,9 @@ function xmldb_lti_upgrade($oldversion) {
         upgrade_mod_savepoint(true, 2017111301, 'lti');
     }
 
+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 
 }

diff --git a/mod/page/db/upgrade.php b/mod/page/db/upgrade.php
index 67a0154..14e6345 100644 (file)
--- a/mod/page/db/upgrade.php
+++ b/mod/page/db/upgrade.php
@@ -56,5 +56,8 @@ function xmldb_page_upgrade($oldversion) {
     // Automatically generated Moodle v3.4.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

diff --git a/mod/quiz/db/upgrade.php b/mod/quiz/db/upgrade.php
index 89757ec..f3b19ee 100644 (file)
--- a/mod/quiz/db/upgrade.php
+++ b/mod/quiz/db/upgrade.php
@@ -196,5 +196,8 @@ function xmldb_quiz_upgrade($oldversion) {
         upgrade_mod_savepoint(true, 2018040800, 'quiz');
     }
 
+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

diff --git a/mod/quiz/report/overview/db/upgrade.php b/mod/quiz/report/overview/db/upgrade.php
index 6a50540..81efd89 100644 (file)
--- a/mod/quiz/report/overview/db/upgrade.php
+++ b/mod/quiz/report/overview/db/upgrade.php
@@ -55,5 +55,8 @@ function xmldb_quiz_overview_upgrade($oldversion) {
         upgrade_plugin_savepoint(true, 2018021800, 'quiz', 'overview');
     }
 
+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

diff --git a/mod/quiz/report/statistics/db/upgrade.php b/mod/quiz/report/statistics/db/upgrade.php
index 147f379..5906ffb 100644 (file)
--- a/mod/quiz/report/statistics/db/upgrade.php
+++ b/mod/quiz/report/statistics/db/upgrade.php
@@ -46,5 +46,8 @@ function xmldb_quiz_statistics_upgrade($oldversion) {
     // Automatically generated Moodle v3.4.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

diff --git a/mod/resource/db/upgrade.php b/mod/resource/db/upgrade.php
index a662488..a181ea3 100644 (file)
--- a/mod/resource/db/upgrade.php
+++ b/mod/resource/db/upgrade.php
@@ -56,5 +56,8 @@ function xmldb_resource_upgrade($oldversion) {
     // Automatically generated Moodle v3.4.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

diff --git a/mod/scorm/db/upgrade.php b/mod/scorm/db/upgrade.php
index 59cb31c..1724c69 100644 (file)
--- a/mod/scorm/db/upgrade.php
+++ b/mod/scorm/db/upgrade.php
@@ -75,5 +75,8 @@ function xmldb_scorm_upgrade($oldversion) {
         upgrade_mod_savepoint(true, 2018041100, 'scorm');
     }
 
+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

diff --git a/mod/survey/db/upgrade.php b/mod/survey/db/upgrade.php
index 347d90f..574dfce 100644 (file)
--- a/mod/survey/db/upgrade.php
+++ b/mod/survey/db/upgrade.php
@@ -50,5 +50,8 @@ function xmldb_survey_upgrade($oldversion) {
     // Automatically generated Moodle v3.4.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

diff --git a/mod/url/db/upgrade.php b/mod/url/db/upgrade.php
index 26ab43d..e5edfeb 100644 (file)
--- a/mod/url/db/upgrade.php
+++ b/mod/url/db/upgrade.php
@@ -56,5 +56,8 @@ function xmldb_url_upgrade($oldversion) {
     // Automatically generated Moodle v3.4.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

diff --git a/mod/wiki/db/upgrade.php b/mod/wiki/db/upgrade.php
index 8537f2a..a6e0266 100644 (file)
--- a/mod/wiki/db/upgrade.php
+++ b/mod/wiki/db/upgrade.php
@@ -49,5 +49,8 @@ function xmldb_wiki_upgrade($oldversion) {
     // Automatically generated Moodle v3.4.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

diff --git a/mod/workshop/db/upgrade.php b/mod/workshop/db/upgrade.php
index fe384c1..6c6e2c3 100644 (file)
--- a/mod/workshop/db/upgrade.php
+++ b/mod/workshop/db/upgrade.php
@@ -65,5 +65,8 @@ function xmldb_workshop_upgrade($oldversion) {
         upgrade_mod_savepoint(true, 2018042700, 'workshop');
     }
 
+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

diff --git a/mod/workshop/form/accumulative/db/upgrade.php b/mod/workshop/form/accumulative/db/upgrade.php
index 7aa5f18..1abb8c8 100644 (file)
--- a/mod/workshop/form/accumulative/db/upgrade.php
+++ b/mod/workshop/form/accumulative/db/upgrade.php
@@ -42,5 +42,8 @@ function xmldb_workshopform_accumulative_upgrade($oldversion) {
     // Automatically generated Moodle v3.4.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

diff --git a/mod/workshop/form/comments/db/upgrade.php b/mod/workshop/form/comments/db/upgrade.php
index ed17780..52cce87 100644 (file)
--- a/mod/workshop/form/comments/db/upgrade.php
+++ b/mod/workshop/form/comments/db/upgrade.php
@@ -42,5 +42,8 @@ function xmldb_workshopform_comments_upgrade($oldversion) {
     // Automatically generated Moodle v3.4.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

diff --git a/mod/workshop/form/numerrors/db/upgrade.php b/mod/workshop/form/numerrors/db/upgrade.php
index 8bbaa8c..6e4f960 100644 (file)
--- a/mod/workshop/form/numerrors/db/upgrade.php
+++ b/mod/workshop/form/numerrors/db/upgrade.php
@@ -42,5 +42,8 @@ function xmldb_workshopform_numerrors_upgrade($oldversion) {
     // Automatically generated Moodle v3.4.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

diff --git a/mod/workshop/form/rubric/db/upgrade.php b/mod/workshop/form/rubric/db/upgrade.php
index a342df1..26d7f9e 100644 (file)
--- a/mod/workshop/form/rubric/db/upgrade.php
+++ b/mod/workshop/form/rubric/db/upgrade.php
@@ -42,5 +42,8 @@ function xmldb_workshopform_rubric_upgrade($oldversion) {
     // Automatically generated Moodle v3.4.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

diff --git a/portfolio/boxnet/db/upgrade.php b/portfolio/boxnet/db/upgrade.php
index fbb1c33..f09a613 100644 (file)
--- a/portfolio/boxnet/db/upgrade.php
+++ b/portfolio/boxnet/db/upgrade.php
@@ -42,5 +42,8 @@ function xmldb_portfolio_boxnet_upgrade($oldversion) {
     // Automatically generated Moodle v3.4.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

diff --git a/portfolio/googledocs/db/upgrade.php b/portfolio/googledocs/db/upgrade.php
index 807eb41..181ddfe 100644 (file)
--- a/portfolio/googledocs/db/upgrade.php
+++ b/portfolio/googledocs/db/upgrade.php
@@ -32,5 +32,8 @@ function xmldb_portfolio_googledocs_upgrade($oldversion) {
     // Automatically generated Moodle v3.4.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

diff --git a/portfolio/picasa/db/upgrade.php b/portfolio/picasa/db/upgrade.php
index 1f58cca..cd6ce31 100644 (file)
--- a/portfolio/picasa/db/upgrade.php
+++ b/portfolio/picasa/db/upgrade.php
@@ -32,5 +32,8 @@ function xmldb_portfolio_picasa_upgrade($oldversion) {
     // Automatically generated Moodle v3.4.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

diff --git a/question/behaviour/manualgraded/db/upgrade.php b/question/behaviour/manualgraded/db/upgrade.php
index aa14c01..a77394f 100644 (file)
--- a/question/behaviour/manualgraded/db/upgrade.php
+++ b/question/behaviour/manualgraded/db/upgrade.php
@@ -39,5 +39,8 @@ function xmldb_qbehaviour_manualgraded_upgrade($oldversion) {
     // Automatically generated Moodle v3.4.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

diff --git a/question/type/calculated/db/upgrade.php b/question/type/calculated/db/upgrade.php
index ca315ac..919accc 100644 (file)
--- a/question/type/calculated/db/upgrade.php
+++ b/question/type/calculated/db/upgrade.php
@@ -41,5 +41,8 @@ function xmldb_qtype_calculated_upgrade($oldversion) {
     // Automatically generated Moodle v3.4.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

diff --git a/question/type/ddmarker/db/upgrade.php b/question/type/ddmarker/db/upgrade.php
index aeae12f..bdb1fbf 100644 (file)
--- a/question/type/ddmarker/db/upgrade.php
+++ b/question/type/ddmarker/db/upgrade.php
@@ -42,5 +42,8 @@ function xmldb_qtype_ddmarker_upgrade($oldversion) {
     // Automatically generated Moodle v3.4.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

diff --git a/question/type/essay/db/upgrade.php b/question/type/essay/db/upgrade.php
index 2c29c45..426c890 100644 (file)
--- a/question/type/essay/db/upgrade.php
+++ b/question/type/essay/db/upgrade.php
@@ -57,5 +57,9 @@ function xmldb_qtype_essay_upgrade($oldversion) {
         // Essay savepoint reached.
         upgrade_plugin_savepoint(true, 2018021800, 'qtype', 'essay');
     }
+
+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

diff --git a/question/type/match/db/upgrade.php b/question/type/match/db/upgrade.php
index 3f10940..9bf2fa7 100644 (file)
--- a/question/type/match/db/upgrade.php
+++ b/question/type/match/db/upgrade.php
@@ -40,5 +40,8 @@ function xmldb_qtype_match_upgrade($oldversion) {
     // Automatically generated Moodle v3.4.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

diff --git a/question/type/multianswer/db/upgrade.php b/question/type/multianswer/db/upgrade.php
index 87c7b04..d618908 100644 (file)
--- a/question/type/multianswer/db/upgrade.php
+++ b/question/type/multianswer/db/upgrade.php
@@ -41,5 +41,8 @@ function xmldb_qtype_multianswer_upgrade($oldversion) {
     // Automatically generated Moodle v3.4.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

diff --git a/question/type/multichoice/db/upgrade.php b/question/type/multichoice/db/upgrade.php
index a60e40b..88d15e9 100644 (file)
--- a/question/type/multichoice/db/upgrade.php
+++ b/question/type/multichoice/db/upgrade.php
@@ -41,5 +41,8 @@ function xmldb_qtype_multichoice_upgrade($oldversion) {
     // Automatically generated Moodle v3.4.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

diff --git a/question/type/numerical/db/upgrade.php b/question/type/numerical/db/upgrade.php
index c4f6323..0f5b5eb 100644 (file)
--- a/question/type/numerical/db/upgrade.php
+++ b/question/type/numerical/db/upgrade.php
@@ -55,5 +55,8 @@ function xmldb_qtype_numerical_upgrade($oldversion) {
     // Automatically generated Moodle v3.4.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

diff --git a/question/type/random/db/upgrade.php b/question/type/random/db/upgrade.php
index a6e32fc..ca7f7a2 100644 (file)
--- a/question/type/random/db/upgrade.php
+++ b/question/type/random/db/upgrade.php
@@ -40,5 +40,8 @@ function xmldb_qtype_random_upgrade($oldversion) {
     // Automatically generated Moodle v3.4.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

diff --git a/question/type/randomsamatch/db/upgrade.php b/question/type/randomsamatch/db/upgrade.php
index 4358252..0447cf7 100644 (file)
--- a/question/type/randomsamatch/db/upgrade.php
+++ b/question/type/randomsamatch/db/upgrade.php
@@ -40,5 +40,8 @@ function xmldb_qtype_randomsamatch_upgrade($oldversion) {
     // Automatically generated Moodle v3.4.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

diff --git a/question/type/shortanswer/db/upgrade.php b/question/type/shortanswer/db/upgrade.php
index 3823dae..8bd0a70 100644 (file)
--- a/question/type/shortanswer/db/upgrade.php
+++ b/question/type/shortanswer/db/upgrade.php
@@ -41,5 +41,8 @@ function xmldb_qtype_shortanswer_upgrade($oldversion) {
     // Automatically generated Moodle v3.4.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

diff --git a/repository/boxnet/db/upgrade.php b/repository/boxnet/db/upgrade.php
index 4d2e451..43443ef 100644 (file)
--- a/repository/boxnet/db/upgrade.php
+++ b/repository/boxnet/db/upgrade.php
@@ -42,5 +42,8 @@ function xmldb_repository_boxnet_upgrade($oldversion) {
     // Automatically generated Moodle v3.4.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

diff --git a/repository/dropbox/db/upgrade.php b/repository/dropbox/db/upgrade.php
index c03d407..0ad961a 100644 (file)
--- a/repository/dropbox/db/upgrade.php
+++ b/repository/dropbox/db/upgrade.php
@@ -36,5 +36,8 @@ function xmldb_repository_dropbox_upgrade($oldversion) {
     // Automatically generated Moodle v3.4.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

diff --git a/repository/flickr/db/upgrade.php b/repository/flickr/db/upgrade.php
index 8c3cc98..1bc5342 100644 (file)
--- a/repository/flickr/db/upgrade.php
+++ b/repository/flickr/db/upgrade.php
@@ -47,5 +47,8 @@ function xmldb_repository_flickr_upgrade($oldversion) {
     // Automatically generated Moodle v3.4.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

diff --git a/repository/googledocs/db/upgrade.php b/repository/googledocs/db/upgrade.php
index 6d8ca5e..e7599ea 100644 (file)
--- a/repository/googledocs/db/upgrade.php
+++ b/repository/googledocs/db/upgrade.php
@@ -64,5 +64,8 @@ function xmldb_repository_googledocs_upgrade($oldversion) {
     // Automatically generated Moodle v3.4.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

diff --git a/repository/onedrive/db/upgrade.php b/repository/onedrive/db/upgrade.php
index 40f2d0b..2591a6c 100644 (file)
--- a/repository/onedrive/db/upgrade.php
+++ b/repository/onedrive/db/upgrade.php
@@ -34,5 +34,8 @@ function xmldb_repository_onedrive_upgrade($oldversion) {
     // Automatically generated Moodle v3.4.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

diff --git a/repository/picasa/db/upgrade.php b/repository/picasa/db/upgrade.php
index 668db4c..0c47a1c 100644 (file)
--- a/repository/picasa/db/upgrade.php
+++ b/repository/picasa/db/upgrade.php
@@ -32,5 +32,8 @@ function xmldb_repository_picasa_upgrade($oldversion) {
     // Automatically generated Moodle v3.4.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

diff --git a/theme/boost/classes/output/core_course/management/renderer.php b/theme/boost/classes/output/core_course/management/renderer.php
index 0f00dbe..9f0d404 100644 (file)
--- a/theme/boost/classes/output/core_course/management/renderer.php
+++ b/theme/boost/classes/output/core_course/management/renderer.php
@@ -416,9 +416,11 @@ class renderer extends \core_course_management_renderer {
      * @param course_in_list $course The currently selected course.
      * @param int $page The page being displayed.
      * @param int $perpage The number of courses to display per page.
+     * @param string|null $viewmode The view mode the page is in, one out of 'default', 'combined', 'courses' or 'categories'.
      * @return string
      */
-    public function course_listing(coursecat $category = null, course_in_list $course = null, $page = 0, $perpage = 20) {
+    public function course_listing(coursecat $category = null, course_in_list $course = null,
+            $page = 0, $perpage = 20, $viewmode = 'default') {
 
         if ($category === null) {
             $html = html_writer::start_div('select-a-category');
@@ -460,13 +462,13 @@ class renderer extends \core_course_management_renderer {
             array('id' => 'course-listing-title', 'tabindex' => '0', 'class' => 'card-header'));
         $html .= html_writer::start_div('card-body');
         $html .= $this->course_listing_actions($category, $course, $perpage);
-        $html .= $this->listing_pagination($category, $page, $perpage);
+        $html .= $this->listing_pagination($category, $page, $perpage, false, $viewmode);
         $html .= html_writer::start_tag('ul', array('class' => 'ml course-list', 'role' => 'group'));
         foreach ($category->get_courses($options) as $listitem) {
             $html .= $this->course_listitem($category, $listitem, $courseid);
         }
         $html .= html_writer::end_tag('ul');
-        $html .= $this->listing_pagination($category, $page, $perpage, true);
+        $html .= $this->listing_pagination($category, $page, $perpage, true, $viewmode);
         $html .= $this->course_bulk_actions($category);
         $html .= html_writer::end_div();
         $html .= html_writer::end_div();

diff --git a/theme/more/db/upgrade.php b/theme/more/db/upgrade.php
index 480e5e9..088c57a 100644 (file)
--- a/theme/more/db/upgrade.php
+++ b/theme/more/db/upgrade.php
@@ -42,5 +42,8 @@ function xmldb_theme_more_upgrade($oldversion) {
     // Automatically generated Moodle v3.4.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

diff --git a/webservice/xmlrpc/locallib.php b/webservice/xmlrpc/locallib.php
index fb888d9..92203e7 100644 (file)
--- a/webservice/xmlrpc/locallib.php
+++ b/webservice/xmlrpc/locallib.php
@@ -133,8 +133,9 @@ class webservice_xmlrpc_server extends webservice_base_server {
      * @param Exception $ex
      */
     protected function send_error($ex = null) {
+        $this->response = $this->generate_error($ex);
         $this->send_headers();
-        echo $this->generate_error($ex);
+        echo $this->response;
     }
 
     /**