From 80e86364f42c816d9cdf1676b6556647b7c98769 Mon Sep 17 00:00:00 2001
From: Jason Fowler <phalacee@gmail.com>
Date: Tue, 30 Jul 2013 08:57:44 +0800
Subject: [PATCH 01/28] MDL-35925 - File picker - Adding aria attributes to
 assist in accessibility

---
 files/renderer.php       | 10 +++++-----
 repository/filepicker.js |  7 +++++--
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/files/renderer.php b/files/renderer.php
index 2e3aca0c07e..c4a321686cb 100644
--- a/files/renderer.php
+++ b/files/renderer.php
@@ -201,9 +201,9 @@ class core_files_renderer extends plugin_renderer_base {
     <div class="fp-navbar">
         <div class="filemanager-toolbar">
             <div class="fp-toolbar">
-                <div class="{!}fp-btn-add"><a href="#"><img src="'.$this->pix_url('a/add_file').'" /> '.$straddfile.'</a></div>
-                <div class="{!}fp-btn-mkdir"><a href="#"><img src="'.$this->pix_url('a/create_folder').'" /> '.$strmakedir.'</a></div>
-                <div class="{!}fp-btn-download"><a href="#"><img src="'.$this->pix_url('a/download_all').'" /> '.$strdownload.'</a></div>
+                <div class="{!}fp-btn-add"><a role="button" href="#"><img src="'.$this->pix_url('a/add_file').'" /> '.$straddfile.'</a></div>
+                <div class="{!}fp-btn-mkdir"><a role="button" href="#"><img src="'.$this->pix_url('a/create_folder').'" /> '.$strmakedir.'</a></div>
+                <div class="{!}fp-btn-download"><a role="button" href="#"><img src="'.$this->pix_url('a/download_all').'" /> '.$strdownload.'</a></div>
             </div>
             <div class="{!}fp-viewbar">
                 <a class="{!}fp-vb-icons" href="#"></a>
@@ -520,10 +520,10 @@ class core_files_renderer extends plugin_renderer_base {
      */
     private function fp_js_template_generallayout() {
         $rv = '
-<div class="file-picker fp-generallayout">
+<div tabindex="0" class="file-picker fp-generallayout" role="dialog" aria-live="assertive">
     <div class="fp-repo-area">
         <ul class="fp-list">
-            <li class="{!}fp-repo"><a href="#"><img class="{!}fp-repo-icon" width="16" height="16" />&nbsp;<span class="{!}fp-repo-name"></span></a></li>
+            <li class="{!}fp-repo"><a href="#"><img class="{!}fp-repo-icon" alt=" " width="16" height="16" />&nbsp;<span class="{!}fp-repo-name"></span></a></li>
         </ul>
     </div>
     <div class="fp-repo-items" tabindex="0">
diff --git a/repository/filepicker.js b/repository/filepicker.js
index 5ae305ea13c..d09c54d47fe 100644
--- a/repository/filepicker.js
+++ b/repository/filepicker.js
@@ -502,6 +502,7 @@ M.core_filepicker.show = function(Y, options) {
         M.core_filepicker.init(Y, options);
     }
     M.core_filepicker.instances[options.client_id].show();
+    document.getElementById("filepicker-"+ options.client_id).focus();
 };
 
 M.core_filepicker.set_templates = function(Y, templates) {
@@ -1291,11 +1292,13 @@ M.core_filepicker.init = function(Y, options) {
         },
         render: function() {
             var client_id = this.options.client_id;
+            var fpid = "filepicker-"+ client_id;
+            var labelid = 'fp-dialog-label_'+ client_id;
             this.fpnode = Y.Node.createWithFilesSkin(M.core_filepicker.templates.generallayout).
-                set('id', 'filepicker-'+client_id);
+                set('id', fpid).set('aria-labelledby', labelid);
             this.mainui = new Y.Panel({
                 srcNode      : this.fpnode,
-                headerContent: M.str.repository.filepicker,
+                headerContent: '<span id="'+ labelid +'">'+ M.str.repository.filepicker +'</span>',
                 zIndex       : 7500,
                 centered     : true,
                 modal        : true,

From 0d435a3d7c668772aa2851407fd4a30ea9d490fd Mon Sep 17 00:00:00 2001
From: Dan Poltawski <dan@moodle.com>
Date: Fri, 23 Aug 2013 10:38:02 +0800
Subject: [PATCH 02/28] MDL-33472 google plugins: move helper functions to
 upgradelib.php

upgrade.php is reserved for the upgrade steps only. See also
MDL-34103
---
 portfolio/googledocs/db/upgrade.php     | 26 +-----------
 portfolio/googledocs/db/upgradelib.php  | 53 +++++++++++++++++++++++++
 portfolio/picasa/db/upgrade.php         | 26 +-----------
 portfolio/picasa/db/upgradelib.php      | 53 +++++++++++++++++++++++++
 repository/googledocs/db/upgrade.php    | 26 +-----------
 repository/googledocs/db/upgradelib.php | 53 +++++++++++++++++++++++++
 repository/picasa/db/upgrade.php        | 26 +-----------
 repository/picasa/db/upgradelib.php     | 53 +++++++++++++++++++++++++
 8 files changed, 216 insertions(+), 100 deletions(-)
 create mode 100644 portfolio/googledocs/db/upgradelib.php
 create mode 100644 portfolio/picasa/db/upgradelib.php
 create mode 100644 repository/googledocs/db/upgradelib.php
 create mode 100644 repository/picasa/db/upgradelib.php

diff --git a/portfolio/googledocs/db/upgrade.php b/portfolio/googledocs/db/upgrade.php
index 8a333e67cdb..086102bf685 100644
--- a/portfolio/googledocs/db/upgrade.php
+++ b/portfolio/googledocs/db/upgrade.php
@@ -20,6 +20,7 @@
  */
 function xmldb_portfolio_googledocs_upgrade($oldversion) {
     global $CFG, $DB;
+    require_once(__DIR__.'/upgradelib.php');
 
     $dbman = $DB->get_manager();
 
@@ -49,28 +50,3 @@ function xmldb_portfolio_googledocs_upgrade($oldversion) {
 
     return true;
 }
-
-function portfolio_googledocs_admin_upgrade_notification() {
-    $admins = get_admins();
-
-    if (empty($admins)) {
-        return;
-    }
-    $a = new stdClass;
-    $a->docsurl = get_docs_url('Google_OAuth_2.0_setup');
-
-    foreach ($admins as $admin) {
-        $message = new stdClass();
-        $message->component         = 'moodle';
-        $message->name              = 'notices';
-        $message->userfrom          = get_admin();
-        $message->userto            = $admin;
-        $message->smallmessage      = get_string('oauth2upgrade_message_small', 'portfolio_googledocs');
-        $message->subject           = get_string('oauth2upgrade_message_subject', 'portfolio_googledocs');
-        $message->fullmessage       = get_string('oauth2upgrade_message_content', 'portfolio_googledocs', $a);
-        $message->fullmessagehtml   = get_string('oauth2upgrade_message_content', 'portfolio_googledocs', $a);
-        $message->fullmessageformat = FORMAT_PLAIN;
-        $message->notification      = 1;
-        message_send($message);
-    }
-}
diff --git a/portfolio/googledocs/db/upgradelib.php b/portfolio/googledocs/db/upgradelib.php
new file mode 100644
index 00000000000..4658ed8deb5
--- /dev/null
+++ b/portfolio/googledocs/db/upgradelib.php
@@ -0,0 +1,53 @@
+<?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/>.
+
+/**
+ * Googledocs portfolio upgrade script.
+ *
+ * @package   portfolio_googledocs
+ * @copyright 2013 Dan Poltawski <dan@moodle.com>
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+/**
+ * Inform admins about setup required for googledocs change.
+ */
+function portfolio_googledocs_admin_upgrade_notification() {
+    $admins = get_admins();
+
+    if (empty($admins)) {
+        return;
+    }
+    $a = new stdClass;
+    $a->docsurl = get_docs_url('Google_OAuth_2.0_setup');
+
+    foreach ($admins as $admin) {
+        $message = new stdClass();
+        $message->component         = 'moodle';
+        $message->name              = 'notices';
+        $message->userfrom          = get_admin();
+        $message->userto            = $admin;
+        $message->smallmessage      = get_string('oauth2upgrade_message_small', 'portfolio_googledocs');
+        $message->subject           = get_string('oauth2upgrade_message_subject', 'portfolio_googledocs');
+        $message->fullmessage       = get_string('oauth2upgrade_message_content', 'portfolio_googledocs', $a);
+        $message->fullmessagehtml   = get_string('oauth2upgrade_message_content', 'portfolio_googledocs', $a);
+        $message->fullmessageformat = FORMAT_PLAIN;
+        $message->notification      = 1;
+        message_send($message);
+    }
+}
diff --git a/portfolio/picasa/db/upgrade.php b/portfolio/picasa/db/upgrade.php
index 8ced99d45cc..ee092b6b76c 100644
--- a/portfolio/picasa/db/upgrade.php
+++ b/portfolio/picasa/db/upgrade.php
@@ -20,6 +20,7 @@
  */
 function xmldb_portfolio_picasa_upgrade($oldversion) {
     global $CFG, $DB;
+    require_once(__DIR__.'/upgradelib.php');
 
     $dbman = $DB->get_manager();
 
@@ -49,28 +50,3 @@ function xmldb_portfolio_picasa_upgrade($oldversion) {
 
     return true;
 }
-
-function portfolio_picasa_admin_upgrade_notification() {
-    $admins = get_admins();
-
-    if (empty($admins)) {
-        return;
-    }
-    $a = new stdClass;
-    $a->docsurl = get_docs_url('Google_OAuth_2.0_setup');
-
-    foreach ($admins as $admin) {
-        $message = new stdClass();
-        $message->component         = 'moodle';
-        $message->name              = 'notices';
-        $message->userfrom          = get_admin();
-        $message->userto            = $admin;
-        $message->smallmessage      = get_string('oauth2upgrade_message_small', 'portfolio_picasa');
-        $message->subject           = get_string('oauth2upgrade_message_subject', 'portfolio_picasa');
-        $message->fullmessage       = get_string('oauth2upgrade_message_content', 'portfolio_picasa', $a);
-        $message->fullmessagehtml   = get_string('oauth2upgrade_message_content', 'portfolio_picasa', $a);
-        $message->fullmessageformat = FORMAT_PLAIN;
-        $message->notification      = 1;
-        message_send($message);
-    }
-}
diff --git a/portfolio/picasa/db/upgradelib.php b/portfolio/picasa/db/upgradelib.php
new file mode 100644
index 00000000000..a711cbfc46f
--- /dev/null
+++ b/portfolio/picasa/db/upgradelib.php
@@ -0,0 +1,53 @@
+<?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/>.
+
+/**
+ * Picasa portfolio upgrade script.
+ *
+ * @package   portfolio_picasa
+ * @copyright 2013 Dan Poltawski <dan@moodle.com>
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+/**
+ * Inform admins about setup required for picasa change.
+ */
+function portfolio_picasa_admin_upgrade_notification() {
+    $admins = get_admins();
+
+    if (empty($admins)) {
+        return;
+    }
+    $a = new stdClass;
+    $a->docsurl = get_docs_url('Google_OAuth_2.0_setup');
+
+    foreach ($admins as $admin) {
+        $message = new stdClass();
+        $message->component         = 'moodle';
+        $message->name              = 'notices';
+        $message->userfrom          = get_admin();
+        $message->userto            = $admin;
+        $message->smallmessage      = get_string('oauth2upgrade_message_small', 'portfolio_picasa');
+        $message->subject           = get_string('oauth2upgrade_message_subject', 'portfolio_picasa');
+        $message->fullmessage       = get_string('oauth2upgrade_message_content', 'portfolio_picasa', $a);
+        $message->fullmessagehtml   = get_string('oauth2upgrade_message_content', 'portfolio_picasa', $a);
+        $message->fullmessageformat = FORMAT_PLAIN;
+        $message->notification      = 1;
+        message_send($message);
+    }
+}
diff --git a/repository/googledocs/db/upgrade.php b/repository/googledocs/db/upgrade.php
index 57ae6de7f3b..781617e4e7b 100644
--- a/repository/googledocs/db/upgrade.php
+++ b/repository/googledocs/db/upgrade.php
@@ -20,6 +20,7 @@
  */
 function xmldb_repository_googledocs_upgrade($oldversion) {
     global $CFG, $DB;
+    require_once(__DIR__.'/upgradelib.php');
 
     $dbman = $DB->get_manager();
 
@@ -52,28 +53,3 @@ function xmldb_repository_googledocs_upgrade($oldversion) {
 
     return true;
 }
-
-function repository_googledocs_admin_upgrade_notification() {
-    $admins = get_admins();
-
-    if (empty($admins)) {
-        return;
-    }
-
-    $a = new stdClass;
-    $a->docsurl = get_docs_url('Google_OAuth_2.0_setup');
-    foreach ($admins as $admin) {
-        $message = new stdClass();
-        $message->component         = 'moodle';
-        $message->name              = 'notices';
-        $message->userfrom          = get_admin();
-        $message->userto            = $admin;
-        $message->smallmessage      = get_string('oauth2upgrade_message_small', 'repository_googledocs');
-        $message->subject           = get_string('oauth2upgrade_message_subject', 'repository_googledocs');
-        $message->fullmessage       = get_string('oauth2upgrade_message_content', 'repository_googledocs', $a);
-        $message->fullmessagehtml   = get_string('oauth2upgrade_message_content', 'repository_googledocs', $a);
-        $message->fullmessageformat = FORMAT_PLAIN;
-        $message->notification      = 1;
-        message_send($message);
-    }
-}
diff --git a/repository/googledocs/db/upgradelib.php b/repository/googledocs/db/upgradelib.php
new file mode 100644
index 00000000000..c065bd0a87e
--- /dev/null
+++ b/repository/googledocs/db/upgradelib.php
@@ -0,0 +1,53 @@
+<?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/>.
+
+/**
+ * Googledocs repository upgrade script.
+ *
+ * @package   repository_googledocs
+ * @copyright 2013 Dan Poltawski <dan@moodle.com>
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+/**
+ * Inform admins about setup required for googledocs change.
+ */
+function repository_googledocs_admin_upgrade_notification() {
+    $admins = get_admins();
+
+    if (empty($admins)) {
+        return;
+    }
+
+    $a = new stdClass;
+    $a->docsurl = get_docs_url('Google_OAuth_2.0_setup');
+    foreach ($admins as $admin) {
+        $message = new stdClass();
+        $message->component         = 'moodle';
+        $message->name              = 'notices';
+        $message->userfrom          = get_admin();
+        $message->userto            = $admin;
+        $message->smallmessage      = get_string('oauth2upgrade_message_small', 'repository_googledocs');
+        $message->subject           = get_string('oauth2upgrade_message_subject', 'repository_googledocs');
+        $message->fullmessage       = get_string('oauth2upgrade_message_content', 'repository_googledocs', $a);
+        $message->fullmessagehtml   = get_string('oauth2upgrade_message_content', 'repository_googledocs', $a);
+        $message->fullmessageformat = FORMAT_PLAIN;
+        $message->notification      = 1;
+        message_send($message);
+    }
+}
diff --git a/repository/picasa/db/upgrade.php b/repository/picasa/db/upgrade.php
index c9132c1cdcc..214de0b3fb8 100644
--- a/repository/picasa/db/upgrade.php
+++ b/repository/picasa/db/upgrade.php
@@ -20,6 +20,7 @@
  */
 function xmldb_repository_picasa_upgrade($oldversion) {
     global $CFG, $DB;
+    require_once(__DIR__.'/upgradelib.php');
 
     $dbman = $DB->get_manager();
 
@@ -52,28 +53,3 @@ function xmldb_repository_picasa_upgrade($oldversion) {
 
     return true;
 }
-
-function repository_picasa_admin_upgrade_notification() {
-    $admins = get_admins();
-
-    if (empty($admins)) {
-        return;
-    }
-    $a = new stdClass;
-    $a->docsurl = get_docs_url('Google_OAuth_2.0_setup');
-
-    foreach ($admins as $admin) {
-        $message = new stdClass();
-        $message->component         = 'moodle';
-        $message->name              = 'notices';
-        $message->userfrom          = get_admin();
-        $message->userto            = $admin;
-        $message->smallmessage      = get_string('oauth2upgrade_message_small', 'repository_picasa');
-        $message->subject           = get_string('oauth2upgrade_message_subject', 'repository_picasa');
-        $message->fullmessage       = get_string('oauth2upgrade_message_content', 'repository_picasa', $a);
-        $message->fullmessagehtml   = get_string('oauth2upgrade_message_content', 'repository_picasa', $a);
-        $message->fullmessageformat = FORMAT_PLAIN;
-        $message->notification      = 1;
-        message_send($message);
-    }
-}
diff --git a/repository/picasa/db/upgradelib.php b/repository/picasa/db/upgradelib.php
new file mode 100644
index 00000000000..4d76af52bef
--- /dev/null
+++ b/repository/picasa/db/upgradelib.php
@@ -0,0 +1,53 @@
+<?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/>.
+
+/**
+ * Picasa repository upgrade script.
+ *
+ * @package   repository_picasa
+ * @copyright 2013 Dan Poltawski <dan@moodle.com>
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+/**
+ * Inform admins about setup required for google picasa change.
+ */
+function repository_picasa_admin_upgrade_notification() {
+    $admins = get_admins();
+
+    if (empty($admins)) {
+        return;
+    }
+    $a = new stdClass;
+    $a->docsurl = get_docs_url('Google_OAuth_2.0_setup');
+
+    foreach ($admins as $admin) {
+        $message = new stdClass();
+        $message->component         = 'moodle';
+        $message->name              = 'notices';
+        $message->userfrom          = get_admin();
+        $message->userto            = $admin;
+        $message->smallmessage      = get_string('oauth2upgrade_message_small', 'repository_picasa');
+        $message->subject           = get_string('oauth2upgrade_message_subject', 'repository_picasa');
+        $message->fullmessage       = get_string('oauth2upgrade_message_content', 'repository_picasa', $a);
+        $message->fullmessagehtml   = get_string('oauth2upgrade_message_content', 'repository_picasa', $a);
+        $message->fullmessageformat = FORMAT_PLAIN;
+        $message->notification      = 1;
+        message_send($message);
+    }
+}

From 7064882041c23a7e9409d1dcde35468a8919260d Mon Sep 17 00:00:00 2001
From: Damyon Wiese <damyon@moodle.com>
Date: Sun, 25 Aug 2013 22:16:34 +0800
Subject: [PATCH 03/28] MDL-41149 assign: Group submission updates emailed to
 wrong person

grade_item_update was altering the userid in the submission record
instead of cloning it. This meant only the last member of a group
recieved all notifications meant for other students in the group.
---
 mod/assign/locallib.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/mod/assign/locallib.php b/mod/assign/locallib.php
index 7a346a97da8..24ee27d1eb8 100644
--- a/mod/assign/locallib.php
+++ b/mod/assign/locallib.php
@@ -3128,9 +3128,10 @@ class assign {
                 $team = groups_get_members($submission->groupid, 'u.id');
 
                 foreach ($team as $member) {
-                    $submission->groupid = 0;
-                    $submission->userid = $member->id;
-                    $this->gradebook_item_update($submission, null);
+                    $membersubmission = clone $submission;
+                    $membersubmission->groupid = 0;
+                    $membersubmission->userid = $member->id;
+                    $this->gradebook_item_update($membersubmission, null);
                 }
                 return;
             }

From 1be71b31313f9efc22ae31130a13f19bd46a4934 Mon Sep 17 00:00:00 2001
From: Mary Evans <lazydaisy@visible-expression.co.uk>
Date: Sun, 25 Aug 2013 17:26:14 +0100
Subject: [PATCH 04/28] MDL-41175 themes: Add/remove group members page broken
 on small screens.

---
 theme/base/style/core.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/theme/base/style/core.css b/theme/base/style/core.css
index 3a91681d7dc..8467a8ecbfc 100644
--- a/theme/base/style/core.css
+++ b/theme/base/style/core.css
@@ -301,6 +301,7 @@ input#id_externalurl {direction:ltr;}
 .groupmanagementtable #potentialcell {width: 42%;}
 .groupmanagementtable #buttonscell {width: 16%;}
 .groupmanagementtable #buttonscell input {width: 80%;}
+.groupmanagementtable #buttonscell p.arrow_button input {width: auto;min-width: 80%;margin: 0 auto;}
 .groupmanagementtable #removeselect_wrapper,
 .groupmanagementtable #addselect_wrapper {width: 100%;}
 .groupmanagementtable #removeselect_wrapper label,

From ba55a0f6c97fcd477fc7e27ce3f2f22c1ee3fdec Mon Sep 17 00:00:00 2001
From: Rajesh Taneja <rajesh@moodle.com>
Date: Mon, 26 Aug 2013 15:20:57 +0800
Subject: [PATCH 05/28] MDL-41418 Administration: Page context should be set
 before setting page title

---
 error/index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/error/index.php b/error/index.php
index 0e57570747d..35de451a486 100644
--- a/error/index.php
+++ b/error/index.php
@@ -49,9 +49,9 @@
     header("Status: 404 Not Found");
 
     $PAGE->set_url('/error/');
+    $PAGE->set_context(get_system_context());
     $PAGE->set_title($site->fullname .':Error');
     $PAGE->set_heading($site->fullname .': Error 404');
-    $PAGE->set_context(get_system_context());
     $PAGE->navbar->add('Error 404 - File not Found');
     echo $OUTPUT->header();
     echo $OUTPUT->box(get_string('pagenotexist', 'error'). '<br />'.s($requesturi), 'generalbox boxaligncenter');

From f8758dc3d35962b1b3c2835199f2560e0441eee8 Mon Sep 17 00:00:00 2001
From: Marina Glancy <marina@moodle.com>
Date: Wed, 14 Aug 2013 13:54:56 +1000
Subject: [PATCH 06/28] MDL-41179 is_user_access_restricted_by_capability()
 must look at specified user and not current

---
 lib/modinfolib.php            |  5 ++--
 lib/tests/modinfolib_test.php | 55 +++++++++++++++++++++++++++++++++++
 2 files changed, 58 insertions(+), 2 deletions(-)

diff --git a/lib/modinfolib.php b/lib/modinfolib.php
index 37a1339fc89..0a7908f918c 100644
--- a/lib/modinfolib.php
+++ b/lib/modinfolib.php
@@ -1218,7 +1218,8 @@ class cm_info extends stdClass {
         }
 
         // You are blocked if you don't have the capability.
-        return !has_capability($capability, context_module::instance($this->id));
+        $userid = $this->modinfo->get_user_id();
+        return !has_capability($capability, context_module::instance($this->id), $userid);
     }
 
     /**
@@ -1227,7 +1228,7 @@ class cm_info extends stdClass {
      * @return bool True if the user cannot see the module. False if the activity is either available or should be greyed out.
      */
     public function is_user_access_restricted_by_conditional_access() {
-        global $CFG, $USER;
+        global $CFG;
 
         if (empty($CFG->enableavailability)) {
             return false;
diff --git a/lib/tests/modinfolib_test.php b/lib/tests/modinfolib_test.php
index f5f65119066..298e3b7e4d8 100644
--- a/lib/tests/modinfolib_test.php
+++ b/lib/tests/modinfolib_test.php
@@ -176,6 +176,61 @@ class modinfolib_testcase extends advanced_testcase {
         $this->assertFalse($cm_info->is_user_access_restricted_by_conditional_access());
     }
 
+    public function test_is_user_access_restricted_by_capability() {
+        global $DB;
+
+        $this->resetAfterTest();
+
+        // Create a course and a mod_assign instance.
+        $course = $this->getDataGenerator()->create_course();
+        $assign = $this->getDataGenerator()->create_module('assign', array('course'=>$course->id));
+
+        // Create and enrol a student.
+        $coursecontext = context_course::instance($course->id);
+        $studentrole = $DB->get_record('role', array('shortname' => 'student'), '*', MUST_EXIST);
+        $student = $this->getDataGenerator()->create_user();
+        role_assign($studentrole->id, $student->id, $coursecontext);
+        $enrolplugin = enrol_get_plugin('manual');
+        $enrolinstance = $DB->get_record('enrol', array('courseid' => $course->id, 'enrol' => 'manual'));
+        $enrolplugin->enrol_user($enrolinstance, $student->id);
+        $this->setUser($student);
+
+        // Make sure student can see the module.
+        $cm = get_fast_modinfo($course->id)->instances['assign'][$assign->id];
+        $this->assertTrue($cm->uservisible);
+        $this->assertFalse($cm->is_user_access_restricted_by_capability());
+
+        // Prohibit student to view mod_assign for the course.
+        role_change_permission($studentrole->id, $coursecontext, 'mod/assign:view', CAP_PROHIBIT);
+        get_fast_modinfo($course->id, 0, true);
+        $cm = get_fast_modinfo($course->id)->instances['assign'][$assign->id];
+        $this->assertFalse($cm->uservisible);
+        $this->assertTrue($cm->is_user_access_restricted_by_capability());
+
+        // Restore permission to student to view mod_assign for the course.
+        role_change_permission($studentrole->id, $coursecontext, 'mod/assign:view', CAP_INHERIT);
+        get_fast_modinfo($course->id, 0, true);
+        $cm = get_fast_modinfo($course->id)->instances['assign'][$assign->id];
+        $this->assertTrue($cm->uservisible);
+        $this->assertFalse($cm->is_user_access_restricted_by_capability());
+
+        // Prohibit student to view mod_assign for the particular module.
+        role_change_permission($studentrole->id, context_module::instance($cm->id), 'mod/assign:view', CAP_PROHIBIT);
+        get_fast_modinfo($course->id, 0, true);
+        $cm = get_fast_modinfo($course->id)->instances['assign'][$assign->id];
+        $this->assertFalse($cm->uservisible);
+        $this->assertTrue($cm->is_user_access_restricted_by_capability());
+
+        // Check calling get_fast_modinfo() for different user:
+        $this->setAdminUser();
+        $cm = get_fast_modinfo($course->id)->instances['assign'][$assign->id];
+        $this->assertTrue($cm->uservisible);
+        $this->assertFalse($cm->is_user_access_restricted_by_capability());
+        $cm = get_fast_modinfo($course->id, $student->id)->instances['assign'][$assign->id];
+        $this->assertFalse($cm->uservisible);
+        $this->assertTrue($cm->is_user_access_restricted_by_capability());
+    }
+
     private function refresh_cm_info($course, $assign) {
         get_fast_modinfo(0, 0, true);
         return get_fast_modinfo($course)->instances['assign'][$assign->id];

From 279f7582a473643c3a202e4db68d3fbb60c690be Mon Sep 17 00:00:00 2001
From: Frederic Massart <fred@moodle.com>
Date: Tue, 27 Aug 2013 10:07:29 +0800
Subject: [PATCH 07/28] MDL-41428 repository_coursefiles: Missing white space
 in name

---
 lang/en/moodle.php             |  1 +
 repository/coursefiles/lib.php | 11 ++++++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/lang/en/moodle.php b/lang/en/moodle.php
index 96c01a052dc..a7bcc3066af 100644
--- a/lang/en/moodle.php
+++ b/lang/en/moodle.php
@@ -328,6 +328,7 @@ $string['courselegacyfiles_help'] = 'The course files area provides some backwar
 
 If you use this area to store course files, you can expose yourself to a number of privacy and security issues, as well as experiencing missing files in backups, course imports and any time content is shared or re-used.  It is therefore recommended that you do not use this area unless you really know what you are doing.';
 $string['courselegacyfiles_link'] = 'coursefiles2';
+$string['courselegacyfilesofcourse'] = 'Legacy course files: {$a}';
 $string['courseoverview'] = 'Course overview';
 $string['courseoverviewgraph'] = 'Course overview graph';
 $string['courseprofiles'] = 'Course profiles';
diff --git a/repository/coursefiles/lib.php b/repository/coursefiles/lib.php
index ba4891a3edd..b81904827b2 100644
--- a/repository/coursefiles/lib.php
+++ b/repository/coursefiles/lib.php
@@ -180,10 +180,15 @@ class repository_coursefiles extends repository {
         return parent::is_visible();
     }
 
+    /**
+     * Return the repository name.
+     *
+     * @return string
+     */
     public function get_name() {
-        list($context, $course, $cm) = get_context_info_array($this->context->id);
-        if (!empty($course)) {
-            return get_string('courselegacyfiles') . format_string($course->shortname, true, array('context' => get_course_context($context)));
+        $context = $this->context->get_course_context(false);
+        if ($context) {
+            return get_string('courselegacyfilesofcourse', 'moodle', $context->get_context_name(false, true));
         } else {
             return get_string('courselegacyfiles');
         }

From 36d31f8081454b07eb7ccd891b1a41b64696e458 Mon Sep 17 00:00:00 2001
From: Marina Glancy <marina@moodle.com>
Date: Mon, 26 Aug 2013 17:41:43 +1000
Subject: [PATCH 08/28] MDL-41317 Set correct context to send bulk message page

---
 user/messageselect.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/user/messageselect.php b/user/messageselect.php
index 51f62919561..2d357424430 100644
--- a/user/messageselect.php
+++ b/user/messageselect.php
@@ -58,13 +58,12 @@ if ($deluser !== 0) {
     $url->param('deluser', $deluser);
 }
 $PAGE->set_url($url);
-$PAGE->set_context(context_system::instance());
 
 if (!$course = $DB->get_record('course', array('id'=>$id))) {
     print_error('invalidcourseid');
 }
 
-require_login();
+require_login($course);
 
 $coursecontext = context_course::instance($id);   // Course context
 $systemcontext = context_system::instance();   // SYSTEM context

From 7e8638914f6d5d2086fbe033ca86093f3ddf7fa9 Mon Sep 17 00:00:00 2001
From: Colin Campbell <colin@umn.edu>
Date: Tue, 27 Aug 2013 09:22:43 -0500
Subject: [PATCH 09/28] MDL-40214 mod_assign: Fixed issue with custom scale
 being lost during restore.

---
 mod/assign/backup/moodle2/restore_assign_stepslib.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/mod/assign/backup/moodle2/restore_assign_stepslib.php b/mod/assign/backup/moodle2/restore_assign_stepslib.php
index 6053447d03b..09cd90f4199 100644
--- a/mod/assign/backup/moodle2/restore_assign_stepslib.php
+++ b/mod/assign/backup/moodle2/restore_assign_stepslib.php
@@ -89,6 +89,9 @@ class restore_assign_activity_structure_step extends restore_activity_structure_
             $data->cutoffdate = $this->apply_date_offset($data->cutoffdate);
         }
 
+        if ($data->grade < 0) { // Scale found, get mapping.
+            $data->grade = -($this->get_mappingid('scale', abs($data->grade)));
+        }
 
         $newitemid = $DB->insert_record('assign', $data);
 

From 530e43776b9aabe9b29f72dbcbc74c9fbca8046e Mon Sep 17 00:00:00 2001
From: Tim Hunt <T.J.Hunt@open.ac.uk>
Date: Wed, 28 Aug 2013 11:15:24 +0100
Subject: [PATCH 10/28] MDL-41348 question code depends on filelib.

I think this used to work because mod/forum/lib.php used to be included
everywhere, and in turn included lib/formslib.php. We should declare the
dependencey explicitly.
---
 question/engine/lib.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/question/engine/lib.php b/question/engine/lib.php
index c4f95cf6e55..e857b816b37 100644
--- a/question/engine/lib.php
+++ b/question/engine/lib.php
@@ -26,6 +26,7 @@
 
 defined('MOODLE_INTERNAL') || die();
 
+require_once($CFG->libdir . '/filelib.php');
 require_once(dirname(__FILE__) . '/questionusage.php');
 require_once(dirname(__FILE__) . '/questionattempt.php');
 require_once(dirname(__FILE__) . '/questionattemptstep.php');

From 83f27b6ccadc599e82302d36fb37b3b97ab176a7 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Gaudreau <jp.gaudreau@umontreal.ca>
Date: Wed, 21 Aug 2013 16:15:50 -0400
Subject: [PATCH 11/28] MDL-36093 grade export: Fix HTML special characters
 printed litteraly.

---
 grade/export/lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/grade/export/lib.php b/grade/export/lib.php
index 784fd16bc2d..a51c9bed5ca 100644
--- a/grade/export/lib.php
+++ b/grade/export/lib.php
@@ -189,7 +189,7 @@ abstract class grade_export {
             $name .= ' ('.get_string('feedback').')';
         }
 
-        return strip_tags($name);
+        return html_to_text($name, 0, false);
     }
 
     /**

From 0fc55f1d0aa2ee448e955c5fdd35198fdca7d4ba Mon Sep 17 00:00:00 2001
From: Mark Nielsen <mark@moodlerooms.com>
Date: Mon, 19 Aug 2013 08:59:18 -0700
Subject: [PATCH 12/28] MDL-32690: Restore 1.9 backup into 2.X fails on missing
 assignment type

Solution is as follows:
* Allow unsupported subplugins to convert from Moodle1 to Moodle2
* On Moodle2 restore hide unsupported subplugins
* Graceful error message in assignment of unsupported subplugins
---
 mod/assignment/backup/moodle1/lib.php         |  9 ++++++++-
 .../moodle2/restore_assignment_stepslib.php   | 20 +++++++++++++++++++
 mod/assignment/lang/en/assignment.php         |  1 +
 mod/assignment/lib.php                        |  7 ++++++-
 mod/assignment/mod_form.php                   |  8 ++++++--
 mod/assignment/view.php                       |  6 +++++-
 6 files changed, 46 insertions(+), 5 deletions(-)

diff --git a/mod/assignment/backup/moodle1/lib.php b/mod/assignment/backup/moodle1/lib.php
index 68c955292f4..9ddc169797d 100644
--- a/mod/assignment/backup/moodle1/lib.php
+++ b/mod/assignment/backup/moodle1/lib.php
@@ -194,7 +194,8 @@ class moodle1_mod_assignment_handler extends moodle1_mod_handler {
         }
 
         if (!isset($this->subpluginhandlers[$subplugin])) {
-            throw new moodle1_convert_exception('unsupported_subplugin', 'assignment_'.$subplugin);
+            // Generic handling, prevents breaking conversion process...
+            $this->subpluginhandlers[$subplugin] = new moodle1_assignment_unsupported_subplugin_handler($this, $subplugin);
         }
 
         return $this->subpluginhandlers[$subplugin];
@@ -236,4 +237,10 @@ abstract class moodle1_assignment_subplugin_handler extends moodle1_submod_handl
 
         //you will probably want to do stuff with $this->xmlwriter here (within your overridden method) to write plugin specific data.
     }
+}
+
+/**
+ * This class handles subplugins that do not exist or that are not supported
+ */
+class moodle1_assignment_unsupported_subplugin_handler extends moodle1_assignment_subplugin_handler {
 }
\ No newline at end of file
diff --git a/mod/assignment/backup/moodle2/restore_assignment_stepslib.php b/mod/assignment/backup/moodle2/restore_assignment_stepslib.php
index 0d95d76d6e2..b7f8f56243e 100644
--- a/mod/assignment/backup/moodle2/restore_assignment_stepslib.php
+++ b/mod/assignment/backup/moodle2/restore_assignment_stepslib.php
@@ -72,6 +72,11 @@ class restore_assignment_activity_structure_step extends restore_activity_struct
         $newitemid = $DB->insert_record('assignment', $data);
         // immediately after inserting "activity" record, call this
         $this->apply_activity_instance($newitemid);
+
+        // Hide unsupported sub-plugins
+        if (!$this->is_valid_assignment_subplugin($data->assignmenttype)) {
+            $DB->set_field('course_modules', 'visible', 0, array('id' => $this->get_task()->get_moduleid()));
+        }
     }
 
     protected function process_assignment_submission($data) {
@@ -100,4 +105,19 @@ class restore_assignment_activity_structure_step extends restore_activity_struct
         $this->add_related_files('mod_assignment', 'submission', 'assignment_submission');
         $this->add_related_files('mod_assignment', 'response', 'assignment_submission');
     }
+
+    /**
+     * Determine if a sub-plugin is supported or not
+     *
+     * @param string $type
+     * @return bool
+     */
+    protected function is_valid_assignment_subplugin($type) {
+        static $subplugins = null;
+
+        if (is_null($subplugins)) {
+            $subplugins = get_plugin_list('assignment');
+        }
+        return array_key_exists($type, $subplugins);
+    }
 }
diff --git a/mod/assignment/lang/en/assignment.php b/mod/assignment/lang/en/assignment.php
index eee525b65e0..29c37facb99 100644
--- a/mod/assignment/lang/en/assignment.php
+++ b/mod/assignment/lang/en/assignment.php
@@ -223,3 +223,4 @@ $string['viewfeedback'] = 'View assignment grades and feedback';
 $string['viewmysubmission'] = 'View my submission';
 $string['viewsubmissions'] = 'View {$a} submitted assignments';
 $string['yoursubmission'] = 'Your submission';
+$string['unsupportedsubplugin'] = 'The assignment type of \'{$a}\' is not currently supported. You may wait until the assignment type is made available, or delete the assignment.';
diff --git a/mod/assignment/lib.php b/mod/assignment/lib.php
index 7ed45af42e3..d3c27c704a1 100644
--- a/mod/assignment/lib.php
+++ b/mod/assignment/lib.php
@@ -3948,7 +3948,12 @@ function assignment_extend_settings_navigation(settings_navigation $settings, na
     global $PAGE, $DB, $USER, $CFG;
 
     $assignmentrow = $DB->get_record("assignment", array("id" => $PAGE->cm->instance));
-    require_once "$CFG->dirroot/mod/assignment/type/$assignmentrow->assignmenttype/assignment.class.php";
+
+    $classfile = "$CFG->dirroot/mod/assignment/type/$assignmentrow->assignmenttype/assignment.class.php";
+    if (!file_exists($classfile)) {
+        return;
+    }
+    require_once($classfile);
 
     $assignmentclass = 'assignment_'.$assignmentrow->assignmenttype;
     $assignmentinstance = new $assignmentclass($PAGE->cm->id, $assignmentrow, $PAGE->cm, $PAGE->course);
diff --git a/mod/assignment/mod_form.php b/mod/assignment/mod_form.php
index bc0818fea2e..0a7e8361dbe 100644
--- a/mod/assignment/mod_form.php
+++ b/mod/assignment/mod_form.php
@@ -9,7 +9,7 @@ class mod_assignment_mod_form extends moodleform_mod {
     protected $_assignmentinstance = null;
 
     function definition() {
-        global $CFG, $DB, $PAGE;
+        global $CFG, $DB, $PAGE, $COURSE;
         $mform =& $this->_form;
 
         // this hack is needed for different settings of each subtype
@@ -29,7 +29,11 @@ class mod_assignment_mod_form extends moodleform_mod {
         $mform->setType('type', PARAM_ALPHA);
         $mform->setDefault('type', $type);
 
-        require_once($CFG->dirroot.'/mod/assignment/type/'.$type.'/assignment.class.php');
+        $classfile = $CFG->dirroot.'/mod/assignment/type/'.$type.'/assignment.class.php';
+        if (!file_exists($classfile)) {
+            throw new moodle_exception('unsupportedsubplugin', 'assignment', new moodle_url('/course/view.php', array('id' => $COURSE->id)), $type);
+        }
+        require_once($classfile);
         $assignmentclass = 'assignment_'.$type;
         $assignmentinstance = new $assignmentclass();
 
diff --git a/mod/assignment/view.php b/mod/assignment/view.php
index 2d80577189c..255a7c70c48 100644
--- a/mod/assignment/view.php
+++ b/mod/assignment/view.php
@@ -40,7 +40,11 @@ require_login($course, true, $cm);
 
 $PAGE->requires->js('/mod/assignment/assignment.js');
 
-require ("$CFG->dirroot/mod/assignment/type/$assignment->assignmenttype/assignment.class.php");
+$classfile = "$CFG->dirroot/mod/assignment/type/$assignment->assignmenttype/assignment.class.php";
+if (!file_exists($classfile)) {
+    throw new moodle_exception('unsupportedsubplugin', 'assignment', new moodle_url('/course/view.php', array('id' => $course->id)), $assignment->assignmenttype);
+}
+require ($classfile);
 $assignmentclass = "assignment_$assignment->assignmenttype";
 $assignmentinstance = new $assignmentclass($cm->id, $assignment, $cm, $course);
 

From 2bcfd98eab96cb7fc43befe8c204885f854b96a4 Mon Sep 17 00:00:00 2001
From: Ankit Agarwal <ankit@moodle.com>
Date: Thu, 29 Aug 2013 14:54:26 +0800
Subject: [PATCH 13/28] MDL-41485 calendar: Replace value of action buttons on
 managesubscription page with int

---
 calendar/lib.php                 | 16 ++++++++++++----
 calendar/managesubscriptions.php |  2 +-
 calendar/renderer.php            |  6 ++++--
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/calendar/lib.php b/calendar/lib.php
index 193b3bea3f8..7da4e0ee0ee 100644
--- a/calendar/lib.php
+++ b/calendar/lib.php
@@ -110,6 +110,16 @@ define('CALENDAR_IMPORT_EVENT_UPDATED',  1);
  */
 define('CALENDAR_IMPORT_EVENT_INSERTED', 2);
 
+/**
+ * CALENDAR_SUBSCRIPTION_UPDATE - Used to represent update action for subscriptions in various forms.
+ */
+define('CALENDAR_SUBSCRIPTION_UPDATE', 1);
+
+/**
+ * CALENDAR_SUBSCRIPTION_REMOVE - Used to represent remove action for subscriptions in various forms.
+ */
+define('CALENDAR_SUBSCRIPTION_REMOVE', 2);
+
 /**
  * Return the days of the week
  *
@@ -2851,11 +2861,9 @@ function calendar_process_subscription_row($subscriptionid, $pollinterval, $acti
     // Fetch the subscription from the database making sure it exists.
     $sub = $DB->get_record('event_subscriptions', array('id' => $subscriptionid), '*', MUST_EXIST);
 
-    $strupdate = get_string('update');
-    $strremove = get_string('remove');
     // Update or remove the subscription, based on action.
     switch ($action) {
-        case $strupdate:
+        case CALENDAR_SUBSCRIPTION_UPDATE:
             // Skip updating file subscriptions.
             if (empty($sub->url)) {
                 break;
@@ -2866,7 +2874,7 @@ function calendar_process_subscription_row($subscriptionid, $pollinterval, $acti
             // Update the events.
             return "<p>".get_string('subscriptionupdated', 'calendar', $sub->name)."</p>" . calendar_update_subscription_events($subscriptionid);
 
-        case $strremove:
+        case CALENDAR_SUBSCRIPTION_REMOVE:
             calendar_delete_subscription($subscriptionid);
             return get_string('subscriptionremoved', 'calendar', $sub->name);
             break;
diff --git a/calendar/managesubscriptions.php b/calendar/managesubscriptions.php
index 21782aaa4d6..06d60b49342 100644
--- a/calendar/managesubscriptions.php
+++ b/calendar/managesubscriptions.php
@@ -33,7 +33,7 @@ $courseid = optional_param('course', SITEID, PARAM_INT);
 // Used for processing subscription actions.
 $subscriptionid = optional_param('id', 0, PARAM_INT);
 $pollinterval  = optional_param('pollinterval', 0, PARAM_INT);
-$action = optional_param('action', '', PARAM_ALPHA);
+$action = optional_param('action', '', PARAM_INT);
 
 $url = new moodle_url('/calendar/managesubscriptions.php');
 if ($courseid != SITEID) {
diff --git a/calendar/renderer.php b/calendar/renderer.php
index b7cbd7978c8..85a2485907d 100644
--- a/calendar/renderer.php
+++ b/calendar/renderer.php
@@ -814,9 +814,11 @@ class core_calendar_renderer extends plugin_renderer_base {
         $html .= html_writer::empty_tag('input', array('type' => 'hidden', 'name' => 'course', 'value' => $courseid));
         $html .= html_writer::empty_tag('input', array('type' => 'hidden', 'name' => 'id', 'value' => $subscription->id));
         if (!empty($subscription->url)) {
-            $html .= html_writer::empty_tag('input', array('type' => 'submit', 'name' => 'action', 'value' => get_string('update')));
+            $html .= html_writer::tag('button', get_string('update'), array('type'  => 'submit', 'name' => 'action',
+                                                                            'value' => CALENDAR_SUBSCRIPTION_UPDATE));
         }
-        $html .= html_writer::empty_tag('input', array('type' => 'submit', 'name' => 'action', 'value' => get_string('remove')));
+        $html .= html_writer::tag('button', get_string('remove'), array('type'  => 'submit', 'name' => 'action',
+                                                                        'value' => CALENDAR_SUBSCRIPTION_REMOVE));
         $html .= html_writer::end_tag('div');
         $html .= html_writer::end_tag('form');
         return $html;

From 7a3b3ac4d2d2de360b24451a30277cf365ee1cf5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20S=CC=8Ckoda?= <commits@skodak.org>
Date: Sat, 24 Aug 2013 22:24:18 +0200
Subject: [PATCH 14/28] MDL-41255 fix incorrect redirection logic when changing
 password

Credit goes to Michael Milette.
---
 login/change_password.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/login/change_password.php b/login/change_password.php
index e2cc58d5e18..f369c034cfb 100644
--- a/login/change_password.php
+++ b/login/change_password.php
@@ -40,7 +40,7 @@ $PAGE->set_context(context_system::instance());
 if ($return) {
     // this redirect prevents security warning because https can not POST to http pages
     if (empty($SESSION->wantsurl)
-            or stripos(str_replace('https://', 'http://', $SESSION->wantsurl), str_replace('https://', 'http://', $CFG->wwwroot.'/login/change_password.php') === 0)) {
+            or stripos(str_replace('https://', 'http://', $SESSION->wantsurl), str_replace('https://', 'http://', $CFG->wwwroot.'/login/change_password.php')) === 0) {
         $returnto = "$CFG->wwwroot/user/view.php?id=$USER->id&course=$id";
     } else {
         $returnto = $SESSION->wantsurl;

From 4b23a6fa056d55588055ca97ab6ed0ec15273319 Mon Sep 17 00:00:00 2001
From: Andrew Nicols <andrew@nicols.co.uk>
Date: Fri, 30 Aug 2013 11:10:27 +0100
Subject: [PATCH 15/28] MDL-41328 Editor: Work around another iOS issue with
 TinyMCE

We apply this only on touchend and not touchstart or touchmove. The
location is not guaranteed until the end of the gesture, and there's no
need to keep applying focus on every move.
---
 lib/editor/tinymce/module.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/lib/editor/tinymce/module.js b/lib/editor/tinymce/module.js
index 3a77d5194c9..ce625ea7823 100644
--- a/lib/editor/tinymce/module.js
+++ b/lib/editor/tinymce/module.js
@@ -68,6 +68,13 @@ M.editor_tinymce.init_editor = function(Y, editorid, options) {
                 ed.contentDocument.addEventListener('keydown', function() {
                     ed.contentWindow.focus();
                 });
+
+                // Whenever a touch event is registered against the content document,
+                // reapply focus. This works around an issue with the location caret not
+                // being focusable without use of the Loupe.
+                ed.contentDocument.addEventListener('touchend', function() {
+                    ed.contentWindow.focus();
+                });
             });
         };
     }

From 74d458916b5bea04c8ac180367f1587b09ec0b21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20S=CC=8Ckoda?= <commits@skodak.org>
Date: Wed, 24 Jul 2013 23:06:53 +0200
Subject: [PATCH 16/28] MDL-40676 ignore null bytes

---
 lib/configonlylib.php                     | 3 +++
 lib/dml/mssql_native_moodle_database.php  | 1 +
 lib/dml/sqlsrv_native_moodle_database.php | 1 +
 lib/moodlelib.php                         | 2 ++
 lib/tests/moodlelib_test.php              | 2 +-
 5 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/lib/configonlylib.php b/lib/configonlylib.php
index 031ac6184aa..8192704259d 100644
--- a/lib/configonlylib.php
+++ b/lib/configonlylib.php
@@ -95,6 +95,9 @@ function min_fix_utf8($value) {
         error_reporting($olderror ^ E_NOTICE);
     }
 
+    // No null bytes expected in our data, so let's remove it.
+    $value = str_replace("\0", '', $value);
+
     static $buggyiconv = null;
     if ($buggyiconv === null) {
         $buggyiconv = (!function_exists('iconv') or iconv('UTF-8', 'UTF-8//IGNORE', '100'.chr(130).'€') !== '100€');
diff --git a/lib/dml/mssql_native_moodle_database.php b/lib/dml/mssql_native_moodle_database.php
index ecdf3bd92d4..fe640178490 100644
--- a/lib/dml/mssql_native_moodle_database.php
+++ b/lib/dml/mssql_native_moodle_database.php
@@ -639,6 +639,7 @@ class mssql_native_moodle_database extends moodle_database {
 
             } else {
                 $param = str_replace("'", "''", $param);
+                $param = str_replace("\0", "", $param);
                 $return .= "N'$param'";
             }
 
diff --git a/lib/dml/sqlsrv_native_moodle_database.php b/lib/dml/sqlsrv_native_moodle_database.php
index 8352d76f2cb..6343249f68e 100644
--- a/lib/dml/sqlsrv_native_moodle_database.php
+++ b/lib/dml/sqlsrv_native_moodle_database.php
@@ -719,6 +719,7 @@ class sqlsrv_native_moodle_database extends moodle_database {
                 $return .= $param;
             } else {
                 $param = str_replace("'", "''", $param);
+                $param = str_replace("\0", "", $param);
                 $return .= "N'$param'";
             }
 
diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index d0c5f18a599..243eeb85da7 100644
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -1164,6 +1164,8 @@ function fix_utf8($value) {
             // shortcut
             return $value;
         }
+        // No null bytes expected in our data, so let's remove it.
+        $value = str_replace("\0", '', $value);
 
         // Lower error reporting because glibc throws bogus notices.
         $olderror = error_reporting();
diff --git a/lib/tests/moodlelib_test.php b/lib/tests/moodlelib_test.php
index 529065750ec..76d59fef496 100644
--- a/lib/tests/moodlelib_test.php
+++ b/lib/tests/moodlelib_test.php
@@ -486,7 +486,7 @@ class moodlelib_testcase extends advanced_testcase {
         $this->assertEquals($object, fix_utf8($object));
 
         // valid utf8 string
-        $this->assertSame("žlutý koníček přeskočil potůček \n\t\r\0", fix_utf8("žlutý koníček přeskočil potůček \n\t\r\0"));
+        $this->assertSame("žlutý koníček přeskočil potůček \n\t\r", fix_utf8("žlutý koníček přeskočil potůček \n\t\r\0"));
 
         // invalid utf8 string
         $this->assertSame('aš', fix_utf8('a'.chr(130).'š'), 'This fails with buggy iconv() when mbstring extenstion is not available as fallback.');

From 8793ba310d820ccbba1450e441c27b2cd8219db4 Mon Sep 17 00:00:00 2001
From: Dan Poltawski <dan@moodle.com>
Date: Mon, 2 Sep 2013 13:58:53 +0800
Subject: [PATCH 17/28] MDL-40676 tests: fix null byte test.

---
 lib/tests/configonlylib_test.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/tests/configonlylib_test.php b/lib/tests/configonlylib_test.php
index dc97baa84df..c56e4be4d78 100644
--- a/lib/tests/configonlylib_test.php
+++ b/lib/tests/configonlylib_test.php
@@ -44,7 +44,7 @@ class core_configonlylib_testcase extends advanced_testcase {
      */
     public function test_min_fix_utf8() {
         $this->assertSame('abc', min_fix_utf8('abc'));
-        $this->assertSame("žlutý koníček přeskočil potůček \n\t\r\0", min_fix_utf8("žlutý koníček přeskočil potůček \n\t\r\0"));
+        $this->assertSame("žlutý koníček přeskočil potůček \n\t\r", min_fix_utf8("žlutý koníček přeskočil potůček \n\t\r\0"));
         $this->assertSame('aš', min_fix_utf8('a'.chr(130).'š'), 'This fails with buggy iconv() when mbstring extenstion is not available as fallback.');
     }
 

From 1fdb431dfef333332ffc5d9178f21cfb17089b67 Mon Sep 17 00:00:00 2001
From: Nitzan Bar <nitzanbar@macam.ac.il>
Date: Thu, 15 Aug 2013 16:27:01 +0300
Subject: [PATCH 18/28] MDL-41259 when duplicate course shortname exists an
 exception is thrown and sync is aborted

---
 enrol/ldap/lang/en/enrol_ldap.php | 1 +
 enrol/ldap/lib.php                | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/enrol/ldap/lang/en/enrol_ldap.php b/enrol/ldap/lang/en/enrol_ldap.php
index a54e35e71c9..d9be622e1bc 100644
--- a/enrol/ldap/lang/en/enrol_ldap.php
+++ b/enrol/ldap/lang/en/enrol_ldap.php
@@ -55,6 +55,7 @@ $string['course_summary_key'] = 'Summary';
 $string['createcourseextid'] = 'CREATE User enrolled to a nonexistant course \'{$a->courseextid}\'';
 $string['createnotcourseextid'] = 'User enrolled to a nonexistant course \'{$a->courseextid}\'';
 $string['creatingcourse'] =  'Creating course \'{$a}\'...';
+$string['duplicateshortname'] = "Course creation failed. Duplicate short name. Skipping course with idnumber '{\$a->idnumber}'...";
 $string['editlock'] = 'Lock value';
 $string['emptyenrolment'] = "Empty enrolment for role '{\$a->role_shortname}' in course '{\$a->course_shortname}'\n";
 $string['enrolname'] = 'LDAP';
diff --git a/enrol/ldap/lib.php b/enrol/ldap/lib.php
index f602ffbd1f2..a50fe5319d1 100644
--- a/enrol/ldap/lib.php
+++ b/enrol/ldap/lib.php
@@ -977,6 +977,12 @@ class enrol_ldap_plugin extends enrol_plugin {
             $course->summary = $course_ext[$this->get_config('course_summary')][0];
         }
 
+        // Check if the shortname already exists if it does - skip course creation.
+        if ($DB->record_exists('course', array('shortname' => $course->shortname))) {
+            $trace->output(get_string('duplicateshortname', 'enrol_ldap', $course));
+            return false;
+        }
+
         $newcourse = create_course($course);
         return $newcourse->id;
     }

From d0ddf08dc03614af5e9737a9582d3d693d44a89a Mon Sep 17 00:00:00 2001
From: Matteo Scaramuccia <moodle@matteoscaramuccia.com>
Date: Sun, 9 Jun 2013 12:19:54 +0200
Subject: [PATCH 19/28] MDL-29218 Repository: Hide the repo if
 repository::plugin_init returns false

---
 admin/repository.php | 4 +++-
 repository/lib.php   | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/admin/repository.php b/admin/repository.php
index 3eb48b0da4d..f2aa3934e91 100644
--- a/admin/repository.php
+++ b/admin/repository.php
@@ -140,8 +140,10 @@ if (($action == 'edit') || ($action == 'new')) {
             $success = $repositorytype->update_options($settings);
         } else {
             $type = new repository_type($plugin, (array)$fromform, $visible);
-            $type->create();
             $success = true;
+            if (!$repoid = $type->create()) {
+                $success = false;
+            }
             $data = data_submitted();
         }
         if ($success) {
diff --git a/repository/lib.php b/repository/lib.php
index 42ed8886535..bdf05ab994a 100644
--- a/repository/lib.php
+++ b/repository/lib.php
@@ -255,6 +255,7 @@ class repository_type {
             }
             //run plugin_init function
             if (!repository::static_function($this->_typename, 'plugin_init')) {
+                $this->update_visibility(false);
                 if (!$silent) {
                     throw new repository_exception('cannotinitplugin', 'repository');
                 }

From 832a19829bc06efd3672b0f57ef5ebe18d991f25 Mon Sep 17 00:00:00 2001
From: Matteo Scaramuccia <moodle@matteoscaramuccia.com>
Date: Mon, 26 Aug 2013 23:32:21 +0200
Subject: [PATCH 20/28] MDL-29218 Repository: $pname, get rid of all the
 useless code

More details in the Tracker.
---
 repository/lib.php | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/repository/lib.php b/repository/lib.php
index bdf05ab994a..da99c4304b3 100644
--- a/repository/lib.php
+++ b/repository/lib.php
@@ -1088,14 +1088,6 @@ abstract class repository {
             return false;
         }
 
-        $pname = null;
-        if (is_object($plugin) || is_array($plugin)) {
-            $plugin = (object)$plugin;
-            $pname = $plugin->name;
-        } else {
-            $pname = $plugin;
-        }
-
         $args = func_get_args();
         if (count($args) <= 2) {
             $args = array();

From c7aac029252715ce97db3292e61de9534c93d40c Mon Sep 17 00:00:00 2001
From: Matteo Scaramuccia <moodle@matteoscaramuccia.com>
Date: Mon, 26 Aug 2013 23:35:39 +0200
Subject: [PATCH 21/28] MDL-29218 Repository: fixed a typo in the PHPDoc

---
 repository/lib.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/repository/lib.php b/repository/lib.php
index da99c4304b3..8ddb378ff4c 100644
--- a/repository/lib.php
+++ b/repository/lib.php
@@ -1075,7 +1075,7 @@ abstract class repository {
      *
      * @static
      * @param string $plugin repository plugin name
-     * @param string $function funciton name
+     * @param string $function function name
      * @return mixed
      */
     public static function static_function($plugin, $function) {
@@ -2299,7 +2299,7 @@ abstract class repository {
 
     /**
      * For oauth like external authentication, when external repository direct user back to moodle,
-     * this funciton will be called to set up token and token_secret
+     * this function will be called to set up token and token_secret
      */
     public function callback() {
     }

From 3bc786adb1e018d42dab86734b56a1ebec8f371d Mon Sep 17 00:00:00 2001
From: Aparup Banerjee <aparup@moodle.com>
Date: Thu, 17 Jan 2013 14:29:55 +0800
Subject: [PATCH 22/28] MDL-37564 linked dependant plugin component text to
 plugins DB

---
 admin/renderer.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/admin/renderer.php b/admin/renderer.php
index 8d496364d35..802cab3f251 100644
--- a/admin/renderer.php
+++ b/admin/renderer.php
@@ -918,9 +918,11 @@ class core_admin_renderer extends plugin_renderer_base {
             } else {
                 $str = 'otherplugin';
             }
+            $componenturl = new moodle_url('https://moodle.org/plugins/view.php?plugin='.$component);
+            $componenturl = html_writer::tag('a', $component, array('href' => $componenturl->out()));
             $requires[] = html_writer::tag('li',
                     get_string($str, 'core_plugin',
-                            array('component' => $component, 'version' => $requiredversion)),
+                            array('component' => $componenturl, 'version' => $requiredversion)),
                     array('class' => $class));
         }
 

From f246359c29a39ee98e1ffc52257bea76dd9e1768 Mon Sep 17 00:00:00 2001
From: Tim Lock <tim.lock@netspot.com.au>
Date: Tue, 20 Aug 2013 10:34:16 +0930
Subject: [PATCH 23/28] MDL-41304: Hide and handle LDAP error when user not in
 context being checked

---
 lib/ldaplib.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/ldaplib.php b/lib/ldaplib.php
index f33306888c9..8f9adbaa38b 100644
--- a/lib/ldaplib.php
+++ b/lib/ldaplib.php
@@ -241,9 +241,11 @@ function ldap_find_userdn($ldapconnection, $username, $contexts, $objectclass, $
         }
 
         if ($search_sub) {
-            $ldap_result = ldap_search($ldapconnection, $context,
-                                       '(&'.$objectclass.'('.$search_attrib.'='.ldap_filter_addslashes($username).'))',
-                                       array($search_attrib));
+            if (!$ldap_result = @ldap_search($ldapconnection, $context,
+                                           '(&'.$objectclass.'('.$search_attrib.'='.ldap_filter_addslashes($username).'))',
+                                           array($search_attrib))) {
+                break; // Not found in this context.
+            }
         } else {
             $ldap_result = ldap_list($ldapconnection, $context,
                                      '(&'.$objectclass.'('.$search_attrib.'='.ldap_filter_addslashes($username).'))',

From b5f9a3b0e3a01d7f39097ac29b7a7cb0dc886cb8 Mon Sep 17 00:00:00 2001
From: Helen Foster <helen@moodle.org>
Date: Tue, 3 Sep 2013 12:56:04 +0200
Subject: [PATCH 24/28] MDL-41568 Merge English strings from the en_fix
 language pack

---
 .../langimport/lang/en/tool_langimport.php    |  4 +-
 admin/tool/xmldb/lang/en/tool_xmldb.php       | 42 ++++++++++++-------
 .../course_list/lang/en/block_course_list.php |  4 +-
 lang/en/admin.php                             | 16 +++----
 lang/en/completion.php                        |  2 +-
 lang/en/error.php                             |  2 +-
 lang/en/install.php                           |  2 +-
 lang/en/mathslib.php                          |  2 +-
 lang/en/repository.php                        |  2 +-
 mod/forum/lang/en/forum.php                   | 12 +++---
 mod/lesson/lang/en/lesson.php                 |  2 +-
 mod/lti/lang/en/lti.php                       |  2 +-
 report/security/lang/en/report_security.php   |  2 +-
 .../field/menu/lang/en/profilefield_menu.php  |  2 +-
 14 files changed, 55 insertions(+), 41 deletions(-)

diff --git a/admin/tool/langimport/lang/en/tool_langimport.php b/admin/tool/langimport/lang/en/tool_langimport.php
index e194219e0dd..87dee884b1d 100644
--- a/admin/tool/langimport/lang/en/tool_langimport.php
+++ b/admin/tool/langimport/lang/en/tool_langimport.php
@@ -23,7 +23,7 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-$string['install'] = 'Install selected language pack';
+$string['install'] = 'Install selected language pack(s)';
 $string['installedlangs'] = 'Installed language packs';
 $string['langimport'] = 'Language import utility';
 $string['langimportdisabled'] = 'Language import feature has been disabled. You have to update your language packs manually at the file-system level. Do not forget to purge string caches after you do so.';
@@ -38,7 +38,7 @@ $string['nolangupdateneeded'] = 'All your language packs are up to date, no upda
 $string['pluginname'] = 'Language packs';
 $string['purgestringcaches'] = 'Purge string caches';
 $string['remotelangnotavailable'] = 'Because Moodle cannot connect to download.moodle.org, it is not possible for language packs to be installed automatically. Please download the appropriate ZIP file(s) from <a href="http://download.moodle.org/langpack/">download.moodle.org/langpack</a>, copy them to your {$a} directory and unzip them manually.';
-$string['uninstall'] = 'Uninstall selected language pack';
+$string['uninstall'] = 'Uninstall selected language pack(s)';
 $string['uninstallconfirm'] = 'You are about to completely uninstall language pack {$a}, are you sure?';
 $string['updatelangs'] = 'Update all installed language packs';
 
diff --git a/admin/tool/xmldb/lang/en/tool_xmldb.php b/admin/tool/xmldb/lang/en/tool_xmldb.php
index 4dfc221820a..040cf3acb54 100644
--- a/admin/tool/xmldb/lang/en/tool_xmldb.php
+++ b/admin/tool/xmldb/lang/en/tool_xmldb.php
@@ -33,24 +33,38 @@ $string['confirmdeleteindex'] = 'Are you absolutely sure that you want to delete
 $string['confirmdeletekey'] = 'Are you absolutely sure that you want to delete the key:';
 $string['confirmdeletetable'] = 'Are you absolutely sure that you want to delete the table:';
 $string['confirmdeletexmlfile'] = 'Are you absolutely sure that you want to delete the file:';
-$string['confirmcheckbigints'] = 'This functionality will search for <a href="http://tracker.moodle.org/browse/MDL-11038">potential wrong integer fields</a> in your Moodle server, generating (but not executing!) automatically the needed SQL statements to have all the integers in your DB properly defined.<br /><br />
-Once generated you can copy such statements and execute them safely with your favourite SQL interface (don\'t forget to backup your data before doing that).<br /><br />
-It\'s highly recommended to be running the latest (+ version) available of your Moodle release (1.8, 1.9, 2.x ...) before executing the search of wrong integers.<br /><br />
+$string['confirmcheckbigints'] = 'This functionality will search for <a href="http://tracker.moodle.org/browse/MDL-11038">potential wrong integer fields</a> in your Moodle server, generating (but not executing!) automatically the needed SQL statements to have all the integers in your DB properly defined.
+
+Once generated you can copy such statements and execute them safely with your favourite SQL interface (don\'t forget to backup your data before doing that).
+
+It\'s highly recommended to be running the latest (+ version) available of your Moodle release before executing the search of wrong integers.
+
 This functionality doesn\'t perform any action against the DB (just reads from it), so can be safely executed at any moment.';
-$string['confirmcheckdefaults'] = 'This functionality will search for inconsistent default values in your Moodle server, generating (but not executing!) the needed SQL statements to have all the default values properly defined.<br /><br />
-Once generated you can copy such statements and execute them safely with your favourite SQL interface (don\'t forget to backup your data before doing that).<br /><br />
-It\'s highly recommended to be running the latest (+ version) available of your Moodle release (1.8, 1.9, 2.x ...) before executing the search of inconsistent default values.<br /><br />
+$string['confirmcheckdefaults'] = 'This functionality will search for inconsistent default values in your Moodle server, generating (but not executing!) the needed SQL statements to have all the default values properly defined.
+
+Once generated you can copy such statements and execute them safely with your favourite SQL interface (don\'t forget to backup your data before doing that).
+
+It\'s highly recommended to be running the latest (+ version) available of your Moodle release before executing the search of inconsistent default values.
+
 This functionality doesn\'t perform any action against the DB (just reads from it), so can be safely executed at any moment.';
-$string['confirmcheckforeignkeys'] = 'This functionality will search for potential violations of the foreign keys defined in the install.xml definitions. (Moodle does not currently generate actual foreign key constraints in the database, which is why invalid data may be present.)<br /><br />
-It\'s highly recommended to be running the latest (+ version) available of your Moodle release (1.8, 1.9, 2.x ...) before executing the search of missing indexes.<br /><br />
+$string['confirmcheckforeignkeys'] = 'This functionality will search for potential violations of the foreign keys defined in the install.xml definitions. (Moodle does not currently generate actual foreign key constraints in the database, which is why invalid data may be present.)
+
+It\'s highly recommended to be running the latest (+ version) available of your Moodle release before executing the search of missing indexes.
+
 This functionality doesn\'t perform any action against the DB (just reads from it), so can be safely executed at any moment.';
-$string['confirmcheckindexes'] = 'This functionality will search for potential missing indexes in your Moodle server, generating (but not executing!) automatically the needed SQL statements to keep everything updated.<br /><br />
-Once generated you can copy such statements and execute them safely with your favourite SQL interface (don\'t forget to backup your data before doing that).<br /><br />
-It\'s highly recommended to be running the latest (+ version) available of your Moodle release (1.8, 1.9, 2.x ...) before executing the search of missing indexes.<br /><br />
+$string['confirmcheckindexes'] = 'This functionality will search for potential missing indexes in your Moodle server, generating (but not executing!) automatically the needed SQL statements to keep everything updated.
+
+Once generated you can copy such statements and execute them safely with your favourite SQL interface (don\'t forget to backup your data before doing that).
+
+It\'s highly recommended to be running the latest (+ version) available of your Moodle release before executing the search of missing indexes.
+
 This functionality doesn\'t perform any action against the DB (just reads from it), so can be safely executed at any moment.';
-$string['confirmcheckoraclesemantics'] = 'This functionality will search for <a href="http://tracker.moodle.org/browse/MDL-29322">Oracle varchar2 columns using BYTE semantics</a> in your Moodle server, generating (but not executing!) automatically the needed SQL statements to have all the columns converted to use CHAR semantics instead (better for cross-db compatibility and increased contents max. length).<br /><br />
-Once generated you can copy such statements and execute them safely with your favourite SQL interface (don\'t forget to backup your data before doing that).<br /><br />
-It\'s highly recommended to be running the latest (+ version) available of your Moodle release (2.2, 2.3, 2.x ...) before executing the search of BYTE semantics.<br /><br />
+$string['confirmcheckoraclesemantics'] = 'This functionality will search for <a href="http://tracker.moodle.org/browse/MDL-29322">Oracle varchar2 columns using BYTE semantics</a> in your Moodle server, generating (but not executing!) automatically the needed SQL statements to have all the columns converted to use CHAR semantics instead (better for cross-db compatibility and increased contents max. length).
+
+Once generated you can copy such statements and execute them safely with your favourite SQL interface (don\'t forget to backup your data before doing that).
+
+It\'s highly recommended to be running the latest (+ version) available of your Moodle release before executing the search of BYTE semantics.
+
 This functionality doesn\'t perform any action against the DB (just reads from it), so can be safely executed at any moment.';
 $string['confirmrevertchanges'] = 'Are you absolutely sure that you want to revert changes performed over:';
 $string['create'] = 'Create';
diff --git a/blocks/course_list/lang/en/block_course_list.php b/blocks/course_list/lang/en/block_course_list.php
index a9e8dc99239..6d8589a0f6f 100644
--- a/blocks/course_list/lang/en/block_course_list.php
+++ b/blocks/course_list/lang/en/block_course_list.php
@@ -26,9 +26,9 @@
 $string['adminview'] = 'Admin view';
 $string['allcourses'] = 'Admin user sees all courses';
 $string['configadminview'] = 'What should the admin see in the course list block?';
-$string['confighideallcourseslink'] = 'Hide "All courses" link at the bottom of the block. Link hiding does not affects Admin\'s view';
+$string['confighideallcourseslink'] = 'Remove the \'All courses\' link under the list of courses. (This setting does not affect the admin view.)';
 $string['course_list:addinstance'] = 'Add a new courses block';
 $string['course_list:myaddinstance'] = 'Add a new courses block to My home';
-$string['hideallcourseslink'] = 'Hide All courses link';
+$string['hideallcourseslink'] = 'Hide \'All courses\' link';
 $string['owncourses'] = 'Admin user sees own courses';
 $string['pluginname'] = 'Courses';
diff --git a/lang/en/admin.php b/lang/en/admin.php
index d99e721afd5..aee90f39880 100644
--- a/lang/en/admin.php
+++ b/lang/en/admin.php
@@ -118,7 +118,7 @@ $string['commonfiltersettings'] = 'Common filter settings';
 $string['commonsettings'] = 'Common settings';
 $string['componentinstalled'] = 'Component installed';
 $string['computedfromlogs'] = 'Computed from logs since {$a}.';
-$string['condifmodeditdefaults'] = 'The values you set here define the default values that are used in the activity settings form when you create a new activity. You can also configure which activity settings are considered advanced.';
+$string['condifmodeditdefaults'] = 'Default values are used in the settings form when creating a new activity or resource.';
 $string['confeditorhidebuttons'] = 'Select the buttons that should be hidden in the HTML editor.';
 $string['configallcountrycodes'] = 'This is the list of countries that may be selected in various places, for example in a user\'s profile. If blank (the default) the list in countries.php in the standard English language pack is used. That is the list from ISO 3166-1. Otherwise, you can specify a comma-separated list of codes, for example \'GB,FR,ES\'. If you add new, non-standard codes here, you will need to add them to countries.php in \'en\' and your language pack.';
 $string['configallowassign'] = 'You can allow people who have the roles on the left side to assign some of the column roles to other people';
@@ -159,15 +159,15 @@ $string['configcronremotepassword'] = 'This means that the cron.php script canno
     http://site.example.com/admin/cron.php?password=opensesame
 </pre>If this is left empty, no password is required.';
 $string['configcurlcache'] = 'Time-to-live for cURL cache, in seconds.';
-$string['configcustommenuitems'] = 'You can configure a custom menu here to be shown by themes. Each line consists of some menu text, a link URL (optional) and a tooltip title (optional), separated by pipe characters. You can specify a structure using hyphens. For example:
+$string['configcustommenuitems'] = 'You can configure a custom menu here to be shown by themes. Each line consists of some menu text, a link URL (optional), a tooltip title (optional) and a language code or comma-separated list of codes (optional, for displaying the line to users of the specified language only), separated by pipe characters. You can specify a structure using hyphens. For example:
 <pre>
 Moodle community|http://moodle.org
 -Moodle free support|http://moodle.org/support
 -Moodle development|http://moodle.org/development
 --Moodle Tracker|http://tracker.moodle.org
---Moodle Docs|http://docs.moodle.org
--Moodle News|http://moodle.org/news
-Moodle company
+--Moodle Docs|http://docs.moodle.org|Moodle Docs in German
+--German Moodle Docs|http://docs.moodle.org/de|Documentation in German|de
+-Moodle News|http://moodle.org/news Moodle company
 -Moodle commercial hosting|http://moodle.com/hosting
 -Moodle commercial support|http://moodle.com/support
 </pre>';
@@ -523,10 +523,10 @@ $string['filters'] = 'Filters';
 $string['filtersettings'] = 'Manage filters';
 $string['filtersettingsgeneral'] = 'General filter settings';
 $string['filteruploadedfiles'] = 'Filter uploaded files';
-$string['forcelogin'] = 'Force users to login';
-$string['forceloginforprofileimage'] = 'Force users to login to view user pictures';
+$string['forcelogin'] = 'Force users to log in';
+$string['forceloginforprofileimage'] = 'Force users to log in to view user pictures';
 $string['forceloginforprofileimage_help'] = 'If enabled, users must login in order to view user profile pictures and the default user picture will be used in all notification emails.';
-$string['forceloginforprofiles'] = 'Force users to login for profiles';
+$string['forceloginforprofiles'] = 'Force users to log in for profiles';
 $string['forcetimezone'] = 'Force default timezone';
 $string['formatuninstallwithcourses'] = 'There are {$a->count} courses using {$a->format}. Their format will be changed to {$a->defaultformat} (default format for this site). Some format-specific data may be lost. Are you sure you want to proceed?';
 $string['formatuninstallconfirm'] = '{$a} will be uninstalled. No courses currently use it. Continue?';
diff --git a/lang/en/completion.php b/lang/en/completion.php
index 8e3a45f3512..597612d1630 100644
--- a/lang/en/completion.php
+++ b/lang/en/completion.php
@@ -51,7 +51,7 @@ $string['completiondisabled'] = 'Disabled, not shown in activity settings';
 $string['completionexpected'] = 'Expect completed on';
 $string['completionexpected_help']='This setting specifies the date when the activity is expected to be completed. The date is not shown to students and is only displayed in the activity completion report.';
 $string['completionicons'] = 'Completion tick boxes';
-$string['completionicons_help'] = 'A tick next an activity name may be used to indicate when the activity is complete.
+$string['completionicons_help'] = 'A tick next to an activity name may be used to indicate when the activity is complete.
 
 If a box with a dotted border is shown, a tick will appear automatically when you have completed the activity according to conditions set by the teacher.
 
diff --git a/lang/en/error.php b/lang/en/error.php
index 5acbece280e..85858d4b53f 100644
--- a/lang/en/error.php
+++ b/lang/en/error.php
@@ -211,7 +211,7 @@ $string['duplicaterolename'] = 'There is already a role with this name!';
 $string['duplicateroleshortname'] = 'There is already a role with this short name!';
 $string['duplicateusername'] = 'Duplicate username - skipping record';
 $string['emailfail'] = 'Emailing failed';
-$string['error'] = 'Error occured';
+$string['error'] = 'Error occurred';
 $string['errorcleaningdirectory'] = 'Error cleaning directory "{$a}"';
 $string['errorcopyingfiles'] = 'Error copying files';
 $string['errorcreatingdirectory'] = 'Error creating directory "{$a}"';
diff --git a/lang/en/install.php b/lang/en/install.php
index aceb61fca90..ea3ac0691cc 100644
--- a/lang/en/install.php
+++ b/lang/en/install.php
@@ -38,7 +38,7 @@ $string['admindirsettingsub'] = 'A very few webhosts use /admin as a special URL
     renaming the admin directory in your installation, and putting that 
     new name here.  For example: <br /> <br /><b>moodleadmin</b><br /> <br />
     This will fix admin links in Moodle.';
-$string['availablelangs'] = 'List of available languages';
+$string['availablelangs'] = 'Available language packs';
 $string['caution'] = 'Caution';
 $string['cliadminpassword'] = 'New admin user password';
 $string['cliadminusername'] = 'Admin account username';
diff --git a/lang/en/mathslib.php b/lang/en/mathslib.php
index ab55cf0fa4e..488cbf8a51d 100644
--- a/lang/en/mathslib.php
+++ b/lang/en/mathslib.php
@@ -23,7 +23,7 @@
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-$string['anunexpectederroroccured'] = 'an unexpected error occured';
+$string['anunexpectederroroccured'] = 'an unexpected error occurred';
 $string['cannotassigntoconstant'] = 'cannot assign to constant \'{$a}\'';
 $string['cannotredefinebuiltinfunction'] = 'cannot redefine built-in function \'{$a}()\'';
 $string['divisionbyzero'] = 'division by zero';
diff --git a/lang/en/repository.php b/lang/en/repository.php
index f06d6695360..60da78b37db 100644
--- a/lang/en/repository.php
+++ b/lang/en/repository.php
@@ -102,7 +102,7 @@ $string['errornotyourfile'] = 'You cannot pick file which is not added by your';
 $string['erroruniquename'] = 'Repository instance name should be unique';
 $string['errorpostmaxsize'] = 'The uploaded file may exceed the post_max_size directive in php.ini.';
 $string['errorwhilecommunicatingwith'] = 'Error while communicating with the repository \'{$a}\'.';
-$string['errorwhiledownload'] = 'An error occured while downloading the file: {$a}';
+$string['errorwhiledownload'] = 'An error occurred while downloading the file: {$a}';
 $string['existingrepository'] = 'This repository already exists';
 $string['federatedsearch'] = 'Federated search';
 $string['fileexists'] = 'File name already being used, please use another name';
diff --git a/mod/forum/lang/en/forum.php b/mod/forum/lang/en/forum.php
index 9ac7be4ed0c..66ecf9b815a 100644
--- a/mod/forum/lang/en/forum.php
+++ b/mod/forum/lang/en/forum.php
@@ -408,14 +408,14 @@ $string['tracking'] = 'Track';
 $string['trackingoff'] = 'Off';
 $string['trackingon'] = 'On';
 $string['trackingoptional'] = 'Optional';
-$string['trackingtype'] = 'Read tracking for this forum?';
-$string['trackingtype_help'] = 'If enabled, participants can track read and unread messages in the forum and in discussions.
+$string['trackingtype'] = 'Read tracking';
+$string['trackingtype_help'] = 'If enabled, participants can track read and unread posts in the forum and in discussions. There are three options:
 
-There are three options:
-
-* Optional - Participants can choose whether to turn tracking on or off
+* Optional - Participants can choose whether to turn tracking on or off via a link in the administration block
 * On - Tracking is always on
-* Off - Tracking is always off';
+* Off - Read and unread posts are not tracked
+
+Note: Forum tracking must also be enabled in the user\'s profile settings.';
 $string['unread'] = 'Unread';
 $string['unreadposts'] = 'Unread posts';
 $string['unreadpostsnumber'] = '{$a} unread posts';
diff --git a/mod/lesson/lang/en/lesson.php b/mod/lesson/lang/en/lesson.php
index be1200f41b0..ca49554a3ac 100644
--- a/mod/lesson/lang/en/lesson.php
+++ b/mod/lesson/lang/en/lesson.php
@@ -235,7 +235,7 @@ $string['maxgrade'] = 'Maximum grade';
 $string['maxgrade_help'] = 'This setting specifies the maximum grade for the lesson. If set to 0, the lesson does not appear in the grades pages.';
 $string['maxhighscores'] = 'Number of high scores displayed';
 $string['maximumnumberofanswersbranches'] = 'Maximum number of answers';
-$string['maximumnumberofanswersbranches_help'] = 'This setting specifies the maximum number of answers that may be used in the lesson. If only true/false questions are used, it can be set to 2. The setting may be changed at any time, since it only effects what the teacher sees, not the data.';
+$string['maximumnumberofanswersbranches_help'] = 'This setting specifies the maximum number of answers that may be used in the lesson. If only true/false questions are used, it can be set to 2. The setting may be changed at any time, since it only affects what the teacher sees, not the data.';
 $string['maximumnumberofattempts'] = 'Maximum number of attempts';
 $string['maximumnumberofattempts_help'] = 'This setting specifies the maximum number of attempts allowed for each question. If answered incorrectly repeatedly, when the maximum is reached, the next page of the lesson is displayed.';
 $string['maximumnumberofattemptsreached'] = 'Maximum number of attempts reached - Moving to next page';
diff --git a/mod/lti/lang/en/lti.php b/mod/lti/lang/en/lti.php
index 2c43bb6d5cd..606e2d6110a 100644
--- a/mod/lti/lang/en/lti.php
+++ b/mod/lti/lang/en/lti.php
@@ -224,7 +224,7 @@ $string['lti:requesttooladd'] = 'Request a tool is configured site-wide';
 $string['lti:view'] = 'Launch external tool activities';
 $string['lti_administration'] = 'LTI Administration';
 $string['lti_errormsg'] = 'The tool returned the following error message: "{$a}"';
-$string['lti_launch_error'] = 'An error occured when launching the external tool: ';
+$string['lti_launch_error'] = 'An error occurred when launching the external tool:';
 $string['lti_launch_error_tool_request'] = '<p>
 To submit a request for an administrator to complete the tool configuration, click <a href="{$a->admin_request_url}" target="_top">here</a>.
 </p>';
diff --git a/report/security/lang/en/report_security.php b/report/security/lang/en/report_security.php
index 84110928ef0..f855296a64b 100644
--- a/report/security/lang/en/report_security.php
+++ b/report/security/lang/en/report_security.php
@@ -85,7 +85,7 @@ $string['check_noauth_details'] = '<p>The <em>No authentication</em> plugin is n
 $string['check_noauth_error'] = 'The No authentication plugin cannot be used on production sites.';
 $string['check_noauth_name'] = 'No authentication';
 $string['check_noauth_ok'] = 'No authentication plugin is disabled.';
-$string['check_openprofiles_details'] = '<p>Open user profiles can be abused by spammers. It is recommended that either <code>Force users to login for profiles</code> or <code>Force users to login</code> are enabled.</p>';
+$string['check_openprofiles_details'] = 'Open user profiles can be abused by spammers. It is recommended that either <code>Force users to log in for profiles</code> or <code>Force users to log in</code> are enabled.';
 $string['check_openprofiles_error'] = 'Anyone can may view user profiles without logging in.';
 $string['check_openprofiles_name'] = 'Open user profiles';
 $string['check_openprofiles_ok'] = 'Login is required before viewing user profiles.';
diff --git a/user/profile/field/menu/lang/en/profilefield_menu.php b/user/profile/field/menu/lang/en/profilefield_menu.php
index cb9b0eb5e18..545d352c537 100644
--- a/user/profile/field/menu/lang/en/profilefield_menu.php
+++ b/user/profile/field/menu/lang/en/profilefield_menu.php
@@ -23,4 +23,4 @@
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-$string['pluginname'] = 'Menu of choices';
+$string['pluginname'] = 'Dropdown menu';

From 4520f30defd68ba46c35e51576ce3400d5141ccd Mon Sep 17 00:00:00 2001
From: Damyon Wiese <damyon@moodle.com>
Date: Mon, 26 Aug 2013 09:15:39 +0800
Subject: [PATCH 25/28] MDL-41179 assign: Ensure a submission record exists for
 lock/unlock

Can't change the function params because it is changed in master already.
This will create a draft submission when a student is prevented from submitting
but that is a minor sideeffect and doesn't happen in master.
---
 mod/assign/locallib.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mod/assign/locallib.php b/mod/assign/locallib.php
index 824ce0684a2..7c87338c733 100644
--- a/mod/assign/locallib.php
+++ b/mod/assign/locallib.php
@@ -4473,7 +4473,7 @@ class assign {
 
         // Give each submission plugin a chance to process the locking.
         $plugins = $this->get_submission_plugins();
-        $submission = $this->get_user_submission($userid, false);
+        $submission = $this->get_user_submission($userid, true);
         foreach ($plugins as $plugin) {
             if ($plugin->is_enabled() && $plugin->is_visible()) {
                 $plugin->lock($submission);
@@ -4509,7 +4509,7 @@ class assign {
 
         // Give each submission plugin a chance to process the locking.
         $plugins = $this->get_submission_plugins();
-        $submission = $this->get_user_submission($userid, false);
+        $submission = $this->get_user_submission($userid, true);
         foreach ($plugins as $plugin) {
             if ($plugin->is_enabled() && $plugin->is_visible()) {
                 $plugin->unlock($submission);

From 3e230a757c08fafc3256794cb3494c38bfff980e Mon Sep 17 00:00:00 2001
From: Damyon Wiese <damyon@moodle.com>
Date: Wed, 4 Sep 2013 12:48:42 +0800
Subject: [PATCH 26/28] MDL-41259 enrol_ldap: Fix for backport branch

Use error_log instead of the newer progress trace.
---
 enrol/ldap/lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/enrol/ldap/lib.php b/enrol/ldap/lib.php
index a50fe5319d1..858440d173c 100644
--- a/enrol/ldap/lib.php
+++ b/enrol/ldap/lib.php
@@ -979,7 +979,7 @@ class enrol_ldap_plugin extends enrol_plugin {
 
         // Check if the shortname already exists if it does - skip course creation.
         if ($DB->record_exists('course', array('shortname' => $course->shortname))) {
-            $trace->output(get_string('duplicateshortname', 'enrol_ldap', $course));
+            error_log($this->errorlogtag . get_string('duplicateshortname', 'enrol_ldap', $course));
             return false;
         }
 

From 3caeaa448ef72b9fd0bc5825e10187862a5bd018 Mon Sep 17 00:00:00 2001
From: Damyon Wiese <damyon@moodle.com>
Date: Wed, 4 Sep 2013 16:16:15 +0800
Subject: [PATCH 27/28] MDL-41259 ldap: Move on to the next course when
 create_course fails

---
 enrol/ldap/lib.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/enrol/ldap/lib.php b/enrol/ldap/lib.php
index 858440d173c..439e54690d6 100644
--- a/enrol/ldap/lib.php
+++ b/enrol/ldap/lib.php
@@ -184,9 +184,10 @@ class enrol_ldap_plugin extends enrol_plugin {
                     if ($this->get_config('autocreate')) { // Autocreate
                         error_log($this->errorlogtag.get_string('createcourseextid', 'enrol_ldap',
                                                                 array('courseextid'=>$course_ext_id)));
-                        if ($newcourseid = $this->create_course($enrol)) {
-                            $course = $DB->get_record('course', array('id'=>$newcourseid));
+                        if (!$newcourseid = $this->create_course($enrol)) {
+                            continue;
                         }
+                        $course = $DB->get_record('course', array('id'=>$newcourseid));
                     } else {
                         error_log($this->errorlogtag.get_string('createnotcourseextid', 'enrol_ldap',
                                                                 array('courseextid'=>$course_ext_id)));
@@ -400,9 +401,10 @@ class enrol_ldap_plugin extends enrol_plugin {
                             if ($this->get_config('autocreate')) { // Autocreate
                                 error_log($this->errorlogtag.get_string('createcourseextid', 'enrol_ldap',
                                                                         array('courseextid'=>$idnumber)));
-                                if ($newcourseid = $this->create_course($course)) {
-                                    $course_obj = $DB->get_record('course', array('id'=>$newcourseid));
+                                if (!$newcourseid = $this->create_course($course)) {
+                                    continue;
                                 }
+                                $course_obj = $DB->get_record('course', array('id'=>$newcourseid));
                             } else {
                                 error_log($this->errorlogtag.get_string('createnotcourseextid', 'enrol_ldap',
                                                                         array('courseextid'=>$idnumber)));

From e78a2d0e449a576c74d2fd2f739bfdfe637e7a1b Mon Sep 17 00:00:00 2001
From: Dan Poltawski <dan@moodle.com>
Date: Thu, 5 Sep 2013 13:35:45 +0800
Subject: [PATCH 28/28] weekly release 2.4.5+

---
 version.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/version.php b/version.php
index a92c37cd649..31ce846d4ee 100644
--- a/version.php
+++ b/version.php
@@ -29,11 +29,11 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$version  = 2012120305.12;              // 20121203      = branching date YYYYMMDD - do not modify!
+$version  = 2012120305.13;              // 20121203      = branching date YYYYMMDD - do not modify!
                                         //         RR    = release increments - 00 in DEV branches
                                         //           .XX = incremental changes
 
-$release  = '2.4.5+ (Build: 20130830)';  // Human-friendly version name
+$release  = '2.4.5+ (Build: 20130905)';  // Human-friendly version name
 
 $branch   = '24';                       // this version's branch
 $maturity = MATURITY_STABLE;            // this version's maturity level