Merge branch 'MDL-62228_33' of git://github.com/markn86/moodle into MOODLE_33_STABLE

Author: David Monllao

admin/roles/classes/privacy/provider.php

@@ -313,9 +313,6 @@ public static function delete_data_for_all_users_in_context(\context $context) {
         // Don't belong to the modifier user.
 
         // Remove data from role_assignments.
-        if (empty($context)) {
-            return;
-        }
         $DB->delete_records('role_assignments', ['contextid' => $context->id]);
     }
     /**

auth/mnet/classes/privacy/provider.php

@@ -211,10 +211,6 @@ public static function export_user_data(approved_contextlist $contextlist) {
     public static function delete_data_for_all_users_in_context(\context $context) {
         global $DB;
 
-        if (empty($context)) {
-            return;
-        }
-
         if ($context->contextlevel != CONTEXT_USER) {
             return;
         }

auth/oauth2/classes/privacy/provider.php

@@ -120,10 +120,6 @@ public static function export_user_data(approved_contextlist $contextlist) {
      * @param  \context $context The context to delete data for.
      */
     public static function delete_data_for_all_users_in_context(\context $context) {
-        if (empty($context)) {
-            return;
-        }
-
         if ($context->contextlevel != CONTEXT_USER) {
             return;
         }

calendar/classes/privacy/provider.php

@@ -183,10 +183,6 @@ public static function export_user_preferences($userid) {
      * @param   context $context Transform the specific context to delete data for.
      */
     public static function delete_data_for_all_users_in_context(\context $context) {
-        if (empty($context)) {
-            return;
-        }
-
         // Delete all Calendar Events in the specified context in batches.
         if ($eventids = array_keys(self::get_calendar_event_ids_by_context($context))) {
             self::delete_batch_records('event', 'id', $eventids);

cohort/classes/privacy/provider.php

@@ -143,10 +143,6 @@ public static function export_user_data(approved_contextlist $contextlist) {
      * @param context $context A user context.
      */
     public static function delete_data_for_all_users_in_context(\context $context) {
-        if (empty($context)) {
-            return;
-        }
-
         if (!$context instanceof \context_system && !$context instanceof \context_coursecat) {
             return;
         }

enrol/classes/privacy/provider.php

@@ -164,9 +164,6 @@ public static function export_user_data(approved_contextlist $contextlist) {
     public static function delete_data_for_all_users_in_context(\context $context) {
         global $DB;
 
-        if (empty($context)) {
-            return;
-        }
         // Sanity check that context is at the User context level.
         if ($context->contextlevel == CONTEXT_COURSE) {
             $sql = "SELECT ue.id

mod/assignment/classes/privacy/provider.php

@@ -215,10 +215,6 @@ public static function export_user_preferences($userid) {
     public static function delete_data_for_all_users_in_context(\context $context) {
         global $DB;
 
-        if (empty($context)) {
-            return;
-        }
-
         if ($context->contextlevel == CONTEXT_MODULE) {
             // Delete all assignment submissions for the assignment associated with the context module.
             $assignment = self::get_assignment_by_context($context);

mod/glossary/classes/privacy/provider.php

@@ -240,9 +240,6 @@ protected static function export_glossary_data_for_user(array $glossarydata, \co
      */
     public static function delete_data_for_all_users_in_context(\context $context) {
         global $DB;
-        if (empty($context)) {
-            return;
-        }
 
         if ($context->contextlevel != CONTEXT_MODULE) {
             return;