Merge branch 'wip-mdl-41456' of git://github.com/rajeshtaneja/moodle

mod/assign/classes/event/all_submissions_downloaded.php

@@ -56,7 +56,7 @@ class all_submissions_downloaded extends \core\event\base {
      *
      * @return array
      */
-    public function get_legacy_logdata() {
+    protected function get_legacy_logdata() {
         return $this->legacylogdata;
     }
 

mod/assign/classes/event/assessable_submitted.php

@@ -81,7 +81,7 @@ class assessable_submitted extends \core\event\assessable_submitted {
      *
      * @return array
      */
-    public function get_legacy_logdata() {
+    protected function get_legacy_logdata() {
         return $this->legacylogdata;
     }
 

mod/assign/classes/event/extension_granted.php

@@ -56,7 +56,7 @@ class extension_granted extends \core\event\base {
      *
      * @return array
      */
-    public function get_legacy_logdata() {
+    protected function get_legacy_logdata() {
         return $this->legacylogdata;
     }
 

mod/assign/classes/event/identities_revealed.php

@@ -56,7 +56,7 @@ class identities_revealed extends \core\event\base {
      *
      * @return array
      */
-    public function get_legacy_logdata() {
+    protected function get_legacy_logdata() {
         return $this->legacylogdata;
     }
 

mod/assign/classes/event/marker_updated.php

@@ -56,7 +56,7 @@ class marker_updated extends \core\event\base {
      *
      * @return array
      */
-    public function get_legacy_logdata() {
+    protected function get_legacy_logdata() {
         return $this->legacylogdata;
     }
 

mod/assign/classes/event/statement_accepted.php

@@ -56,7 +56,7 @@ class statement_accepted extends \core\event\base {
      *
      * @return array
      */
-    public function get_legacy_logdata() {
+    protected function get_legacy_logdata() {
         return $this->legacylogdata;
     }
 

mod/assign/classes/event/submission_duplicated.php

@@ -56,7 +56,7 @@ class submission_duplicated extends \core\event\base {
      *
      * @return array
      */
-    public function get_legacy_logdata() {
+    protected function get_legacy_logdata() {
         return $this->legacylogdata;
     }
 

mod/assign/classes/event/submission_graded.php

@@ -56,7 +56,7 @@ class submission_graded extends \core\event\base {
      *
      * @return array
      */
-    public function get_legacy_logdata() {
+    protected function get_legacy_logdata() {
         return $this->legacylogdata;
     }
 

mod/assign/classes/event/submission_locked.php

@@ -56,7 +56,7 @@ class submission_locked extends \core\event\base {
      *
      * @return array
      */
-    public function get_legacy_logdata() {
+    protected function get_legacy_logdata() {
         return $this->legacylogdata;
     }
 

mod/assign/classes/event/submission_status_updated.php

@@ -56,7 +56,7 @@ class submission_status_updated extends \core\event\base {
      *
      * @return array
      */
-    public function get_legacy_logdata() {
+    protected function get_legacy_logdata() {
         return $this->legacylogdata;
     }
 

mod/assign/classes/event/submission_unlocked.php

@@ -56,7 +56,7 @@ class submission_unlocked extends \core\event\base {
      *
      * @return array
      */
-    public function get_legacy_logdata() {
+    protected function get_legacy_logdata() {
         return $this->legacylogdata;
     }
 

mod/assign/classes/event/submission_updated.php

@@ -56,7 +56,7 @@ class submission_updated extends \core\event\base {
      *
      * @return array
      */
-    public function get_legacy_logdata() {
+    protected function get_legacy_logdata() {
         return $this->legacylogdata;
     }
 

mod/assign/classes/event/workflow_state_updated.php

@@ -56,7 +56,7 @@ class workflow_state_updated extends \core\event\base {
      *
      * @return array
      */
-    public function get_legacy_logdata() {
+    protected function get_legacy_logdata() {
         return $this->legacylogdata;
     }
 

mod/assignment/type/online/classes/event/assessable_uploaded.php

@@ -76,10 +76,10 @@ class assessable_uploaded extends \core\event\assessable_uploaded {
     /**
      * Return localised event name.
      *
-     * @return \lang_string
+     * @return string
      */
     public static function get_name() {
-        return new \lang_string('event_assessable_uploaded', 'assignment_online');
+        return get_string('event_assessable_uploaded', 'assignment_online');
     }
 
     /**

mod/assignment/type/upload/classes/event/assessable_submitted.php

@@ -81,10 +81,10 @@ class assessable_submitted extends \core\event\assessable_submitted {
     /**
      * Return localised event name.
      *
-     * @return \lang_string
+     * @return string
      */
     public static function get_name() {
-        return new \lang_string('event_assessable_submitted', 'assignment_submitted');
+        return get_string('event_assessable_submitted', 'assignment_submitted');
     }
 
     /**

mod/assignment/type/upload/classes/event/assessable_uploaded.php

@@ -92,10 +92,10 @@ class assessable_uploaded extends \core\event\assessable_uploaded {
     /**
      * Return localised event name.
      *
-     * @return \lang_string
+     * @return string
      */
     public static function get_name() {
-        return new \lang_string('event_assessable_uploaded', 'assignment_upload');
+        return get_string('event_assessable_uploaded', 'assignment_upload');
     }
 
     /**

mod/forum/classes/event/assessable_uploaded.php

@@ -76,10 +76,10 @@ class assessable_uploaded extends \core\event\assessable_uploaded {
     /**
      * Return localised event name.
      *
-     * @return \lang_string
+     * @return string
      */
     public static function get_name() {
-        return new \lang_string('event_assessable_uploaded', 'mod_forum');
+        return get_string('event_assessable_uploaded', 'mod_forum');
     }
 
     /**

mod/workshop/classes/event/assessable_uploaded.php

@@ -91,10 +91,10 @@ class assessable_uploaded extends \core\event\assessable_uploaded {
     /**
      * Return localised event name.
      *
-     * @return \lang_string
+     * @return string
      */
     public static function get_name() {
-        return new \lang_string('event_assessable_uploaded', 'mod_workshop');
+        return get_string('event_assessable_uploaded', 'mod_workshop');
     }
 
     /**