Merge branch 'MDL-42930-master' of git://github.com/damyon/moodle

Conflicts:
	mod/scorm/db/upgrade.php

mod/assign/db/upgrade.php

@@ -459,5 +459,8 @@ function xmldb_assign_upgrade($oldversion) {
         upgrade_mod_savepoint(true, 2013061101, 'assign');
     }
 
+    // Moodle v2.6.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

mod/assign/feedback/comments/db/upgrade.php

@@ -38,5 +38,8 @@ function xmldb_assignfeedback_comments_upgrade($oldversion) {
     // Moodle v2.5.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Moodle v2.6.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

mod/assign/feedback/editpdf/db/upgrade.php

@@ -64,5 +64,8 @@ function xmldb_assignfeedback_editpdf_upgrade($oldversion) {
         upgrade_plugin_savepoint(true, 2013110800, 'assignfeedback', 'editpdf');
     }
 
+    // Moodle v2.6.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

mod/assign/feedback/file/db/upgrade.php

@@ -38,5 +38,8 @@ function xmldb_assignfeedback_file_upgrade($oldversion) {
     // Moodle v2.5.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Moodle v2.6.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

mod/assign/submission/comments/db/upgrade.php

@@ -37,6 +37,9 @@ function xmldb_assignsubmission_comments_upgrade($oldversion) {
     // Moodle v2.5.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Moodle v2.6.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
 

mod/assign/submission/file/db/upgrade.php

@@ -35,6 +35,9 @@ function xmldb_assignsubmission_file_upgrade($oldversion) {
     // Moodle v2.5.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Moodle v2.6.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
 

mod/assign/submission/onlinetext/db/upgrade.php

@@ -37,6 +37,9 @@ function xmldb_assignsubmission_onlinetext_upgrade($oldversion) {
     // Moodle v2.5.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Moodle v2.6.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
 

mod/assignment/db/upgrade.php

@@ -78,6 +78,9 @@ function xmldb_assignment_upgrade($oldversion) {
     // Put any upgrade step following this.
 
 
+    // Moodle v2.6.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
 

mod/book/db/upgrade.php

@@ -198,5 +198,8 @@ function xmldb_book_upgrade($oldversion) {
     // Put any upgrade step following this.
 
 
+    // Moodle v2.6.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

mod/chat/db/upgrade.php

@@ -41,6 +41,9 @@ function xmldb_chat_upgrade($oldversion) {
     // Put any upgrade step following this.
 
 
+    // Moodle v2.6.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
 

mod/choice/db/upgrade.php

@@ -41,6 +41,9 @@ function xmldb_choice_upgrade($oldversion) {
     // Put any upgrade step following this.
 
 
+    // Moodle v2.6.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
 

mod/data/db/upgrade.php

@@ -128,6 +128,9 @@ function xmldb_data_upgrade($oldversion) {
     // Put any upgrade step following this.
 
 
+    // Moodle v2.6.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
 

mod/feedback/db/upgrade.php

@@ -55,6 +55,9 @@ function xmldb_feedback_upgrade($oldversion) {
     // Put any upgrade step following this.
 
 
+    // Moodle v2.6.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
 

mod/folder/db/upgrade.php

@@ -114,5 +114,8 @@ function xmldb_folder_upgrade($oldversion) {
     // Put any upgrade step following this.
 
 
+    // Moodle v2.6.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

mod/forum/db/upgrade.php

@@ -109,5 +109,8 @@ function xmldb_forum_upgrade($oldversion) {
         upgrade_mod_savepoint(true, 2013071000, 'forum');
     }
 
+    // Moodle v2.6.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

mod/glossary/db/upgrade.php

@@ -56,6 +56,9 @@ function xmldb_glossary_upgrade($oldversion) {
     // Put any upgrade step following this.
 
 
+    // Moodle v2.6.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
 

mod/imscp/db/upgrade.php

@@ -47,5 +47,8 @@ function xmldb_imscp_upgrade($oldversion) {
     // Put any upgrade step following this.
 
 
+    // Moodle v2.6.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

mod/label/db/upgrade.php

@@ -82,6 +82,9 @@ function xmldb_label_upgrade($oldversion) {
     // Put any upgrade step following this.
 
 
+    // Moodle v2.6.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
 

mod/lesson/db/upgrade.php

@@ -73,6 +73,9 @@ function xmldb_lesson_upgrade($oldversion) {
     // Put any upgrade step following this.
 
 
+    // Moodle v2.6.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
 

mod/lti/db/upgrade.php

@@ -80,6 +80,9 @@ function xmldb_lti_upgrade($oldversion) {
     // Put any upgrade step following this.
 
 
+    // Moodle v2.6.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
 

mod/page/db/upgrade.php

@@ -67,5 +67,8 @@ function xmldb_page_upgrade($oldversion) {
     // Put any upgrade step following this.
 
 
+    // Moodle v2.6.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

mod/quiz/db/upgrade.php

@@ -407,6 +407,9 @@ function xmldb_quiz_upgrade($oldversion) {
     // Put any upgrade step following this.
 
 
+    // Moodle v2.6.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
 

mod/quiz/report/overview/db/upgrade.php

@@ -50,5 +50,8 @@ function xmldb_quiz_overview_upgrade($oldversion) {
     // Put any upgrade step following this.
 
 
+    // Moodle v2.6.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

mod/quiz/report/statistics/db/upgrade.php

@@ -130,6 +130,9 @@ function xmldb_quiz_statistics_upgrade($oldversion) {
         upgrade_plugin_savepoint(true, 2013093000, 'quiz', 'statistics');
     }
 
+    // Moodle v2.6.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
 

mod/resource/db/upgrade.php

@@ -67,5 +67,8 @@ function xmldb_resource_upgrade($oldversion) {
     // Put any upgrade step following this.
 
 
+    // Moodle v2.6.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

mod/scorm/db/upgrade.php

@@ -175,6 +175,9 @@ function xmldb_scorm_upgrade($oldversion) {
         upgrade_mod_savepoint(true, 2013090100, 'scorm');
     }
 
+    // Moodle v2.6.0 release upgrade line.
+    // Put any upgrade step following this.
+
     if ($oldversion < 2013110501) {
         // Fix invalid $scorm->launch records.
         // Get all scorms that have a launch value that references a sco from a different scorm.

mod/survey/db/upgrade.php

@@ -41,6 +41,9 @@ function xmldb_survey_upgrade($oldversion) {
     // Put any upgrade step following this.
 
 
+    // Moodle v2.6.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
 

mod/url/db/upgrade.php

@@ -67,5 +67,8 @@ function xmldb_url_upgrade($oldversion) {
     // Put any upgrade step following this.
 
 
+    // Moodle v2.6.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

mod/wiki/db/upgrade.php

@@ -78,5 +78,8 @@ function xmldb_wiki_upgrade($oldversion) {
     // Put any upgrade step following this.
 
 
+    // Moodle v2.6.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

mod/workshop/db/upgrade.php

@@ -154,5 +154,8 @@ function xmldb_workshop_upgrade($oldversion) {
     // Put any upgrade step following this.
 
 
+    // Moodle v2.6.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

mod/workshop/form/accumulative/db/upgrade.php

@@ -50,5 +50,8 @@ function xmldb_workshopform_accumulative_upgrade($oldversion) {
     // Put any upgrade step following this.
 
 
+    // Moodle v2.6.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

mod/workshop/form/comments/db/upgrade.php

@@ -50,5 +50,8 @@ function xmldb_workshopform_comments_upgrade($oldversion) {
     // Put any upgrade step following this.
 
 
+    // Moodle v2.6.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

mod/workshop/form/numerrors/db/upgrade.php

@@ -50,5 +50,8 @@ function xmldb_workshopform_numerrors_upgrade($oldversion) {
     // Put any upgrade step following this.
 
 
+    // Moodle v2.6.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

mod/workshop/form/rubric/db/upgrade.php

@@ -50,5 +50,8 @@ function xmldb_workshopform_rubric_upgrade($oldversion) {
     // Put any upgrade step following this.
 
 
+    // Moodle v2.6.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }