MDL-45357 events: Remove unnecessary the before 'id' in event descriptions

admin/tool/capability/classes/event/report_viewed.php

@@ -59,7 +59,7 @@ class report_viewed extends \core\event\base {
      * @return string
      */
     public function get_description() {
-        return "The user with the id '$this->userid' viewed the capability overview report.";
+        return "The user with id '$this->userid' viewed the capability overview report.";
     }
 
     /**

lib/classes/event/blog_association_created.php

@@ -70,8 +70,8 @@ class blog_association_created extends base {
      * @return string
      */
     public function get_description() {
-        return "The user with the id '$this->userid' associated the context '{$this->other['associatetype']}' with the id " .
-            "'{$this->other['associateid']}' to the blog entry with the id '{$this->other['blogid']}'.";
+        return "The user with id '$this->userid' associated the context '{$this->other['associatetype']}' with id " .
+            "'{$this->other['associateid']}' to the blog entry with id '{$this->other['blogid']}'.";
     }
 
     /**

lib/classes/event/blog_comment_created.php

@@ -50,6 +50,6 @@ class blog_comment_created extends comment_created {
      * @return string
      */
     public function get_description() {
-        return "The user with the id '$this->userid' added the comment to the blog with the id '{$this->other['itemid']}'.";
+        return "The user with id '$this->userid' added the comment to the blog with id '{$this->other['itemid']}'.";
     }
 }

lib/classes/event/blog_comment_deleted.php

@@ -50,6 +50,6 @@ class blog_comment_deleted extends comment_deleted {
      * @return string
      */
     public function get_description() {
-        return "The user with the id '$this->userid' deleted the comment for the blog with the id '{$this->other['itemid']}'.";
+        return "The user with id '$this->userid' deleted the comment for the blog with id '{$this->other['itemid']}'.";
     }
 }

lib/classes/event/blog_entries_viewed.php

@@ -67,7 +67,7 @@ class blog_entries_viewed extends base {
      * @return string
      */
     public function get_description() {
-        return "The user with the id '$this->userid' viewed blog entries.";
+        return "The user with id '$this->userid' viewed blog entries.";
     }
 
     /**

lib/classes/event/blog_entry_created.php

@@ -88,7 +88,7 @@ class blog_entry_created extends base {
      * @return string
      */
     public function get_description() {
-        return "The user with the id '$this->userid' created the blog entry with the id '$this->objectid'.";
+        return "The user with id '$this->userid' created the blog entry with id '$this->objectid'.";
     }
 
     /**

lib/classes/event/blog_entry_deleted.php

@@ -87,7 +87,7 @@ class blog_entry_deleted extends base {
      * @return string
      */
     public function get_description() {
-        return "The user with the id '$this->userid' deleted the blog entry with the id '$this->objectid'.";
+        return "The user with id '$this->userid' deleted the blog entry with id '$this->objectid'.";
     }
 
     /**

lib/classes/event/blog_entry_updated.php

@@ -86,7 +86,7 @@ class blog_entry_updated extends base {
      * @return string
      */
     public function get_description() {
-        return "The user with the id '$this->userid' updated the blog entry with the id '$this->objectid'.";
+        return "The user with id '$this->userid' updated the blog entry with id '$this->objectid'.";
     }
 
     /**

lib/classes/event/calendar_event_created.php

@@ -71,7 +71,7 @@ class calendar_event_created extends base {
      */
     public function get_description() {
         $eventname = s($this->other['name']);
-        return "The user with the id '$this->userid' created the event '$eventname' with the id '$this->objectid'.";
+        return "The user with id '$this->userid' created the event '$eventname' with id '$this->objectid'.";
     }
 
     /**

lib/classes/event/calendar_event_deleted.php

@@ -71,7 +71,7 @@ class calendar_event_deleted extends base {
      */
     public function get_description() {
         $eventname = s($this->other['name']);
-        return "The user with the id '$this->userid' deleted the event '$eventname' with the id '$this->objectid'.";
+        return "The user with id '$this->userid' deleted the event '$eventname' with id '$this->objectid'.";
     }
 
     /**

lib/classes/event/calendar_event_updated.php

@@ -71,7 +71,7 @@ class calendar_event_updated extends base {
      */
     public function get_description() {
         $eventname = s($this->other['name']);
-        return "The user with the id '$this->userid' updated the event '$eventname' with the id '$this->objectid'.";
+        return "The user with id '$this->userid' updated the event '$eventname' with id '$this->objectid'.";
     }
 
     /**

lib/classes/event/cohort_created.php

@@ -61,7 +61,7 @@ class cohort_created extends base {
      * @return string
      */
     public function get_description() {
-        return "The user with the id '$this->userid' created the cohort with the id '$this->objectid'.";
+        return "The user with id '$this->userid' created the cohort with id '$this->objectid'.";
     }
 
     /**

lib/classes/event/cohort_deleted.php

@@ -61,7 +61,7 @@ class cohort_deleted extends base {
      * @return string
      */
     public function get_description() {
-        return "The user with the id '$this->userid' deleted the cohort with the id '$this->objectid'.";
+        return "The user with id '$this->userid' deleted the cohort with id '$this->objectid'.";
     }
 
     /**

lib/classes/event/cohort_member_added.php

@@ -61,8 +61,8 @@ class cohort_member_added extends base {
      * @return string
      */
     public function get_description() {
-        return "The user with the id '$this->userid' added the user with the id '$this->relateduserid' to the cohort with " .
-            "the id '$this->objectid'.";
+        return "The user with id '$this->userid' added the user with id '$this->relateduserid' to the cohort with " .
+            "id '$this->objectid'.";
     }
 
     /**

lib/classes/event/cohort_member_removed.php

@@ -62,8 +62,8 @@ class cohort_member_removed extends base {
      * @return string
      */
     public function get_description() {
-        return "The user with the id '$this->userid' removed the user with the id '$this->relateduserid' from the cohort with " .
-            "the id '$this->objectid'.";
+        return "The user with id '$this->userid' removed the user with id '$this->relateduserid' from the cohort with " .
+            "id '$this->objectid'.";
     }
 
     /**

lib/classes/event/cohort_updated.php

@@ -61,7 +61,7 @@ class cohort_updated extends base {
      * @return string
      */
     public function get_description() {
-        return "The user with the id '$this->userid' updated the cohort with the id '$this->objectid'.";
+        return "The user with id '$this->userid' updated the cohort with id '$this->objectid'.";
     }
 
     /**

lib/classes/event/comment_created.php

@@ -70,7 +70,7 @@ abstract class comment_created extends base {
      * @return string
      */
     public function get_description() {
-        return "The user with the id '$this->userid' added the comment with the id '$this->objectid' to the '$this->component' " .
+        return "The user with id '$this->userid' added the comment with id '$this->objectid' to the '$this->component' " .
             "with the course module id '$this->contextinstanceid'.";
     }
 

lib/classes/event/comment_deleted.php

@@ -70,7 +70,7 @@ abstract class comment_deleted extends base {
      * @return string
      */
     public function get_description() {
-        return "The user with the id '$this->userid' deleted the comment with the id '$this->objectid' from the '$this->component' " .
+        return "The user with id '$this->userid' deleted the comment with id '$this->objectid' from the '$this->component' " .
             "with the course module id '$this->contextinstanceid'.";
     }
 

lib/classes/event/comments_viewed.php

@@ -63,7 +63,7 @@ abstract class comments_viewed extends base {
      * @return string
      */
     public function get_description() {
-        return "The user with the id '$this->userid' viewed the comments for '$this->component' with instance id '$this->objectid'.";
+        return "The user with id '$this->userid' viewed the comments for '$this->component' with instance id '$this->objectid'.";
     }
 
     /**

lib/classes/event/content_viewed.php

@@ -86,7 +86,7 @@ abstract class content_viewed extends base {
      * @return string
      */
     public function get_description() {
-        return "The user with the id '$this->userid' viewed content.";
+        return "The user with id '$this->userid' viewed content.";
     }
 
     /**