MDL-35864 enrol: misc fixups

* Removed get_config_instance_capabilities() which was from
  older reviewed vrsions of the patch
* Added note to upgrade.txt
* Fixed deprecation note
* Bump versions

diff --git a/enrol/category/version.php b/enrol/category/version.php
index fbe7f92..54262d8 100644 (file)
--- a/enrol/category/version.php
+++ b/enrol/category/version.php
@@ -24,7 +24,7 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2014051201;        // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2014050800;        // Requires this Moodle version
+$plugin->version   = 2014072200;        // The current plugin version (Date: YYYYMMDDXX)
+$plugin->requires  = 2014072200;        // Requires this Moodle version
 $plugin->component = 'enrol_category';  // Full name of the plugin (used for diagnostics)
 $plugin->cron      = 60;

diff --git a/enrol/cohort/version.php b/enrol/cohort/version.php
index 7961267..02cf824 100644 (file)
--- a/enrol/cohort/version.php
+++ b/enrol/cohort/version.php
@@ -24,7 +24,7 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2014051200;        // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2014050800;        // Requires this Moodle version
+$plugin->version   = 2014072200;        // The current plugin version (Date: YYYYMMDDXX)
+$plugin->requires  = 2014072200;        // Requires this Moodle version
 $plugin->component = 'enrol_cohort';    // Full name of the plugin (used for diagnostics)
 $plugin->cron      = 60*60;             // run cron every hour by default, it is not out-of-sync often

diff --git a/enrol/database/version.php b/enrol/database/version.php
index c8c04a3..9dff389 100644 (file)
--- a/enrol/database/version.php
+++ b/enrol/database/version.php
@@ -24,7 +24,7 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2014051201;        // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2014050800;        // Requires this Moodle version
+$plugin->version   = 2014072200;        // The current plugin version (Date: YYYYMMDDXX)
+$plugin->requires  = 2014072200;        // Requires this Moodle version
 $plugin->component = 'enrol_database';  // Full name of the plugin (used for diagnostics)
 //TODO: should we add cron sync?

diff --git a/enrol/flatfile/version.php b/enrol/flatfile/version.php
index 5289f09..05fb255 100644 (file)
--- a/enrol/flatfile/version.php
+++ b/enrol/flatfile/version.php
@@ -25,7 +25,7 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2014051200;        // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2014050800;        // Requires this Moodle version
+$plugin->version   = 2014072200;        // The current plugin version (Date: YYYYMMDDXX)
+$plugin->requires  = 2014072200;        // Requires this Moodle version
 $plugin->component = 'enrol_flatfile';  // Full name of the plugin (used for diagnostics)
 $plugin->cron      = 60;

diff --git a/enrol/guest/version.php b/enrol/guest/version.php
index b506dd2..1ef76e0 100644 (file)
--- a/enrol/guest/version.php
+++ b/enrol/guest/version.php
@@ -24,6 +24,6 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2014051200;        // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2014050800;        // Requires this Moodle version
+$plugin->version   = 2014072200;        // The current plugin version (Date: YYYYMMDDXX)
+$plugin->requires  = 2014072200;        // Requires this Moodle version
 $plugin->component = 'enrol_guest';     // Full name of the plugin (used for diagnostics)

diff --git a/enrol/imsenterprise/version.php b/enrol/imsenterprise/version.php
index ad89d47..6ab78fb 100644 (file)
--- a/enrol/imsenterprise/version.php
+++ b/enrol/imsenterprise/version.php
@@ -24,7 +24,7 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2014051201;
-$plugin->requires  = 2014050800;
+$plugin->version   = 2014072200;        // The current plugin version (Date: YYYYMMDDXX)
+$plugin->requires  = 2014072200;        // Requires this Moodle version
 $plugin->component = 'enrol_imsenterprise';
 $plugin->cron      = 60;

diff --git a/enrol/ldap/version.php b/enrol/ldap/version.php
index a1b47dc..76505ab 100644 (file)
--- a/enrol/ldap/version.php
+++ b/enrol/ldap/version.php
@@ -25,6 +25,6 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2014051200;        // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2014050800;        // Requires this Moodle version
+$plugin->version   = 2014072200;        // The current plugin version (Date: YYYYMMDDXX)
+$plugin->requires  = 2014072200;        // Requires this Moodle version
 $plugin->component = 'enrol_ldap';      // Full name of the plugin (used for diagnostics)

diff --git a/enrol/manual/version.php b/enrol/manual/version.php
index 4089156..963d30d 100644 (file)
--- a/enrol/manual/version.php
+++ b/enrol/manual/version.php
@@ -24,7 +24,7 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2014051200;        // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2014050800;        // Requires this Moodle version
+$plugin->version   = 2014072200;        // The current plugin version (Date: YYYYMMDDXX)
+$plugin->requires  = 2014072200;        // Requires this Moodle version
 $plugin->component = 'enrol_manual';    // Full name of the plugin (used for diagnostics)
 $plugin->cron      = 600;

diff --git a/enrol/meta/version.php b/enrol/meta/version.php
index 1fab182..4951f33 100644 (file)
--- a/enrol/meta/version.php
+++ b/enrol/meta/version.php
@@ -24,7 +24,7 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2014051200;        // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2014050800;        // Requires this Moodle version
+$plugin->version   = 2014072200;        // The current plugin version (Date: YYYYMMDDXX)
+$plugin->requires  = 2014072200;        // Requires this Moodle version
 $plugin->component = 'enrol_meta';      // Full name of the plugin (used for diagnostics)
-$plugin->cron      = 60*60;             // run cron every hour by default, it is not out-of-sync often
\ No newline at end of file
+$plugin->cron      = 60*60;             // run cron every hour by default, it is not out-of-sync often

diff --git a/enrol/mnet/version.php b/enrol/mnet/version.php
index 7c561d3..c78a309 100644 (file)
--- a/enrol/mnet/version.php
+++ b/enrol/mnet/version.php
@@ -24,6 +24,6 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2014051201;        // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2014050800;        // Requires this Moodle version
+$plugin->version   = 2014072200;        // The current plugin version (Date: YYYYMMDDXX)
+$plugin->requires  = 2014072200;        // Requires this Moodle version
 $plugin->component = 'enrol_mnet';      // Full name of the plugin (used for diagnostics)

diff --git a/enrol/paypal/version.php b/enrol/paypal/version.php
index 4fd1649..abce57d 100644 (file)
--- a/enrol/paypal/version.php
+++ b/enrol/paypal/version.php
@@ -25,7 +25,7 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2014051200;        // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2014050800;        // Requires this Moodle version
+$plugin->version   = 2014072200;        // The current plugin version (Date: YYYYMMDDXX)
+$plugin->requires  = 2014072200;        // Requires this Moodle version
 $plugin->component = 'enrol_paypal';    // Full name of the plugin (used for diagnostics)
 $plugin->cron      = 60;

diff --git a/enrol/self/version.php b/enrol/self/version.php
index 9e01613..47de8ce 100644 (file)
--- a/enrol/self/version.php
+++ b/enrol/self/version.php
@@ -24,7 +24,7 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2014051200;        // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2014050800;        // Requires this Moodle version
+$plugin->version   = 2014072200;        // The current plugin version (Date: YYYYMMDDXX)
+$plugin->requires  = 2014072200;        // Requires this Moodle version
 $plugin->component = 'enrol_self';      // Full name of the plugin (used for diagnostics)
 $plugin->cron      = 600;

diff --git a/enrol/upgrade.txt b/enrol/upgrade.txt
index dc6d2c0..2bed0e7 100644 (file)
--- a/enrol/upgrade.txt
+++ b/enrol/upgrade.txt
@@ -1,6 +1,10 @@
 This files describes API changes in /enrol/* - plugins,
 information provided here is intended especially for developers.
 
+=== 2.8 ===
+
+* enrol_plugin::instance_deleteable() is deprecated and has been replaced by enrol_plugin::can_delete_instance()
+
 === 2.6 ===
 
 * Enrolment plugin which supports self enrolment should implement can_self_enrol()

diff --git a/lib/enrollib.php b/lib/enrollib.php
index c9e6439..580896c 100644 (file)
--- a/lib/enrollib.php
+++ b/lib/enrollib.php
@@ -1541,7 +1541,7 @@ abstract class enrol_plugin {
      * Is it possible to delete enrol instance via standard UI?
      *
      * @deprecated since Moodle 2.8 MDL-35864 - please use can_delete_instance() instead.
-     * @todo MDL-35864 This will be deleted in Moodle 2.9.
+     * @todo MDL-46479 This will be deleted in Moodle 3.0.
      * @see class_name::can_delete_instance()
      * @param object $instance
      * @return bool
@@ -2324,14 +2324,4 @@ abstract class enrol_plugin {
         // Implement if you want to restore protected group memberships,
         // usually this is not necessary because plugins should be able to recreate the memberships automatically.
     }
-
-    /**
-     * Which capabilities are needed to configure the enrol instance via standard UI
-     *
-     * @return array Array with capabilities needed to configure the enrol instance
-     */
-    public function get_config_instance_capabilities() {
-        return array();
-    }
-
 }

diff --git a/version.php b/version.php
index bae9d7b..1c50bd0 100644 (file)
--- a/version.php
+++ b/version.php
@@ -29,7 +29,7 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$version  = 2014071700.00;              // YYYYMMDD      = weekly release date of this DEV branch.
+$version  = 2014072200.00;              // YYYYMMDD      = weekly release date of this DEV branch.
                                         //         RR    = release increments - 00 in DEV branches.
                                         //           .XX = incremental changes.