From: toyomoyo <toyomoyo>
Date: Thu, 10 May 2007 03:46:10 +0000 (+0000)
Subject: prefix is no longer needed for the array containing event dataI(e.g. $mod_assignment_... 
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=ecca85812f019701af4d6f103a292f613a754565;p=moodle.git

prefix is no longer needed for the array containing event dataI(e.g. $mod_assignment_events", $events is sufficient.
---

diff --git a/lib/eventslib.php b/lib/eventslib.php
index 6fee7a8b62..bfa1bcbcb5 100755
--- a/lib/eventslib.php
+++ b/lib/eventslib.php
@@ -29,25 +29,23 @@ function events_load_def($component) {
             // 'block'. So we need to jump through hoops.
             $defpath = $CFG->dirroot.'/'.$compparts[0].
                                 's/'.$compparts[1].'/db/events.php';
-            $varprefix = $compparts[0].'_'.$compparts[1];
         } else if ($compparts[0] == 'format') {
             // Similar to the above, course formats are 'format' while they 
             // are stored in 'course/format'.
             $defpath = $CFG->dirroot.'/course/'.$component.'/db/events.php';
-            $varprefix = $compparts[0].'_'.$compparts[1];
         } else {
             $defpath = $CFG->dirroot.'/'.$component.'/db/events.php';
-            $varprefix = str_replace('/', '_', $component);
         }
     }
     $events = array();
 
     if (file_exists($defpath)) {
         require($defpath);
-        $events = ${$varprefix.'_events'};
+        $compevents = $events;
+    }
+    if ($compevents) {
+        return $compevents;
     }
-    
-    return $events;
 }
 
 /**