Merge branch 'wip-MDL-62138-master' of git://github.com/marinaglancy/…

…moodle
robjoyce · May 1, 2018 · 39b17e9 · 39b17e9
2 parents cb3cd93 + dde3d58
commit 39b17e9
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 67 deletions.
diff --git a/admin/registration/classes/privacy/provider.php b/admin/registration/classes/privacy/provider.php
diff --git a/lang/en/register.php b/lang/en/register.php
diff --git a/lib/classes/component.php b/lib/classes/component.php
@@ -472,10 +472,8 @@ protected static function fetch_subsystems() {
             'plugin'      => null,
             'portfolio'   => $CFG->dirroot.'/portfolio',
             'privacy'     => $CFG->dirroot . '/privacy',
-            'publish'     => $CFG->dirroot.'/course/publish',
             'question'    => $CFG->dirroot.'/question',
             'rating'      => $CFG->dirroot.'/rating',
-            'register'    => $CFG->dirroot.'/'.$CFG->admin.'/registration', // Broken badly if $CFG->admin changed.
             'repository'  => $CFG->dirroot.'/repository',
             'rss'         => $CFG->dirroot.'/rss',
             'role'        => $CFG->dirroot.'/'.$CFG->admin.'/roles',

diff --git a/lib/tests/component_test.php b/lib/tests/component_test.php
@@ -36,7 +36,7 @@ class core_component_testcase extends advanced_testcase {
      * this is defined here to annoy devs that try to add more without any thinking,
      * always verify that it does not collide with any existing add-on modules and subplugins!!!
      */
-    const SUBSYSTEMCOUNT = 68;
+    const SUBSYSTEMCOUNT = 66;
 
     public function setUp() {
         $psr0namespaces = new ReflectionProperty('core_component', 'psr0namespaces');