Merge branch 'master_MDL-50133' of https://github.com/danmarsden/moodle

Conflicts:
	mod/scorm/version.php

mod/scorm/db/access.php

@@ -51,7 +51,7 @@ $capabilities = array(
 
     'mod/scorm:skipview' => array(
 
-        'captype' => 'write',
+        'captype' => 'read',
         'contextlevel' => CONTEXT_MODULE,
         'archetypes' => array(
             'student' => CAP_ALLOW
@@ -83,7 +83,7 @@ $capabilities = array(
     ),
     'mod/scorm:deleteresponses' => array(
 
-        'captype' => 'read',
+        'captype' => 'write',
         'contextlevel' => CONTEXT_MODULE,
         'archetypes' => array(
             'teacher' => CAP_ALLOW,

mod/scorm/version.php

@@ -24,7 +24,7 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2015051100;    // The current module version (Date: YYYYMMDDXX).
+$plugin->version   = 2015051101;    // The current module version (Date: YYYYMMDDXX).
 $plugin->requires  = 2015050500;    // Requires this Moodle version.
 $plugin->component = 'mod_scorm';   // Full name of the plugin (used for diagnostics).
 $plugin->cron      = 300;