Default user activity preferences for new users

htdocs/lib/activity.php

@@ -411,14 +411,13 @@ function activity_get_users($activitytype, $userids=null, $userobjs=null, $admin
  * id
  */
 function activity_set_defaults($user_id) {
-    global $USER;
-
-    log_debug($USER);
-    log_debug($user_id);
-
     $activitytypes = get_records_array('activity_type', 'admin', 0);
     foreach ($activitytypes as $type) {
-        log_debug('set ' . $type . ' for ' . $user_id);
+        insert_record('usr_activity_preference', (object)array(
+            'usr' => $user_id,
+            'activity' => $type->name,
+            'method' => 'internal',
+        ));
     }
     
 }

htdocs/lib/mahara.php

@@ -657,7 +657,7 @@ function handle_event($event, $data) {
     // this is here because the core can't listen to events
     // @todo, this is VERY ugly, and someone should fix it
     if ($event == 'createuser') {
-        activity_set_defaults($event->id);
+        activity_set_defaults($data->id);
     }
 
     $plugintypes = plugin_types();