Merge branch 'wip-mdl-41000' of git://github.com/rajeshtaneja/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 6 Aug 2013 05:45:16 +0000 (17:45 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 6 Aug 2013 05:45:16 +0000 (17:45 +1200)
1  2 
lib/classes/event/base.php
lib/classes/event/user_loggedin.php

@@@ -240,9 -238,9 +238,9 @@@ abstract class base implements \Iterato
       */
      public static function get_name() {
          // Override in subclass with real lang string.
 -        $parts = explode('\\', __CLASS__);
 +        $parts = explode('\\', get_called_class());
          if (count($parts) !== 3) {
-             return 'unknown event';
+             return get_string('unknownevent', 'error');
          }
          return $parts[0].': '.str_replace('_', ' ', $parts[2]);
      }
Simple merge