From a160cf0b1760ea2c6367ea6143cc73fb9aee00ba Mon Sep 17 00:00:00 2001
From: toyomoyo <toyomoyo>
Date: Tue, 10 Jul 2007 02:33:38 +0000
Subject: [PATCH] fix for MDL-9983, trigger certain events out of the core to
 modules

---
 course/category.php       | 5 ++---
 group/edit.php            | 5 ++++-
 login/change_password.php | 6 ++++++
 user/edit.php             | 6 ------
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/course/category.php b/course/category.php
index 68414c2cce..a71901d9b7 100644
--- a/course/category.php
+++ b/course/category.php
@@ -58,6 +58,8 @@
             if (! set_field("course_categories", "name", $category->name, "id", $category->id)) {
                 notify("An error occurred while renaming the category");
             }
+            // MDL-9983
+            events_trigger('category_updated', $category);
         }
 
         /// Set the category theme if requested
@@ -87,9 +89,6 @@
                 fix_course_sortorder($category->id);
             }
         }
-        
-        // MDL-9983
-        events_trigger('category_updated', $category);
     }
 
 
diff --git a/group/edit.php b/group/edit.php
index 30e93d4cf1..57008c5d72 100755
--- a/group/edit.php
+++ b/group/edit.php
@@ -84,7 +84,10 @@ if ($delete) {
     }
     if (groups_delete_group($id)) {
         // MDL-9983
-        events_trigger('group_deleted', $id);
+        $eventdata = new object();
+        $eventdata->group = $id;
+        $eventdata->course = $courseid;
+        events_trigger('group_deleted', $eventdata); 
         redirect(groups_home_url($course->id, null, $groupingid, false));
     } else {
         print_error('erroreditgroup', 'group', groups_home_url($course->id));
diff --git a/login/change_password.php b/login/change_password.php
index 525f02db8c..e9647f74c6 100644
--- a/login/change_password.php
+++ b/login/change_password.php
@@ -68,6 +68,12 @@
 
         $strpasswordchanged = get_string('passwordchanged');
 
+        // MDL-9983
+        $eventdata = new object();
+        $eventdata -> user = $USER;
+        $eventdata -> newpassword = $data -> newpassword1;
+        events_trigger('password_changed', $eventdata);
+
         add_to_log($course->id, 'user', 'change password', "view.php?id=$USER->id&amp;course=$course->id", "$USER->id");
 
         $fullname = fullname($USER, true);
diff --git a/user/edit.php b/user/edit.php
index bb1b29619c..751c9d5b40 100644
--- a/user/edit.php
+++ b/user/edit.php
@@ -113,12 +113,6 @@
             }
         }
 
-        // MDL-9983
-        $eventdata = new object();
-        $eventdata -> user = $USER;
-        $eventdata -> newpassword = $data -> newpassword1;
-        events_trigger('password_changed', $eventdata);
-
         redirect("$CFG->wwwroot/user/view.php?id=$user->id&course=$course->id");
     }
 
-- 
2.39.5