Merge branch 'MDL-66404-master' of git://github.com/cescobedo/moodle

diff --cc h5p/classes/player.php
index c680a5a,8413cf8..6ef87ab
--- 1/h5p/classes/player.php
--- 2/h5p/classes/player.php
+++ b/h5p/classes/player.php
@@@ -194,8 -173,8 +194,8 @@@ class player 
       *
       * @return string The HTML code to display this H5P content.
       */
 -    public function output() : string {
 +    public function output(): string {
-         global $OUTPUT;
+         global $OUTPUT, $USER;
  
          $template = new \stdClass();
          $template->h5pid = $this->h5pid;

diff --cc lang/en/h5p.php
index 5f34212,99a1390..221c3c4
--- 1/lang/en/h5p.php
--- 2/lang/en/h5p.php
+++ b/lang/en/h5p.php
@@@ -71,7 -71,8 +71,9 @@@ $string['downloadtitle'] = 'Download th
  $string['editor'] = 'Editor';
  $string['embed'] = 'Embed';
  $string['embedtitle'] = 'View the embed code for this content.';
+ $string['eventh5pviewed'] = 'H5P viewed';
+ $string['eventh5pdeleted'] = 'H5P deleted';
 +$string['fetchtypesfailure'] = 'No information could be obtained on the H5P content types available. H5P repository connection failure';
  $string['fileExceedsMaxSize'] = 'One of the files inside the package exceeds the maximum file size allowed. ({$a->%file} {$a->%used} > {$a->%max})';
  $string['fullscreen'] = 'Fullscreen';
  $string['gpl'] = 'General Public License v3';