issue #139 - cleaning up compatibility code lower than M2.6

jpahullo · Mar 20, 2018 · ac028c4 · ac028c4
1 parent 41b3505
commit ac028c4
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 24 deletions.
diff --git a/db/events.php b/db/events.php
@@ -27,22 +27,11 @@
  *
  * Available events: merging_sucess, merging_failed
  */
-if ($CFG->branch < 26) {
-    $handlers = array(
-        'merging_success' => array(
-            'handlerfile'      => '/admin/tool/mergeusers/lib/events/olduser.php',
-            'handlerfunction'  => 'tool_mergeusers_old_user_suspend',
-            'schedule'         => 'instant',
-            'internal'         => 1,
-        ),
-    );
-} else {
-    $observers = array(
-        array(
-            'eventname'     => 'tool_mergeusers\event\user_merged_success',
-            'callback'      => 'tool_mergeusers_old_user_suspend',
-            'includefile'   => '/admin/tool/mergeusers/lib/events/olduser.php',
-            'internal'      => 1
-        )
-    );
-}
+$observers = array(
+    array(
+        'eventname'     => 'tool_mergeusers\event\user_merged_success',
+        'callback'      => 'tool_mergeusers_old_user_suspend',
+        'includefile'   => '/admin/tool/mergeusers/lib/events/olduser.php',
+        'internal'      => 1
+    )
+);
diff --git a/lib/events/olduser.php b/lib/events/olduser.php
@@ -36,11 +36,7 @@
 function tool_mergeusers_old_user_suspend($event) {
     global $DB, $CFG;
 
-    if ($CFG->branch < 26) {
-        $oldid = $event->oldid;
-    } else {
-        $oldid = $event->other['usersinvolved']['fromid'];
-    }
+    $oldid = $event->other['usersinvolved']['fromid'];
 
     // Check configuration to see if the old user gets suspended
     $enabled = (int)get_config('tool_mergeusers', 'suspenduser');