Merge branch 'MDL-69270-master' of git://github.com/ferranrecio/moodle

diff --cc contentbank/classes/contenttype.php
Simple merge

diff --cc contentbank/tests/contenttype_test.php
Simple merge

diff --cc contentbank/view.php
index a482d80,64ecf74..4c84b1b
--- 1/contentbank/view.php
--- 2/contentbank/view.php
+++ b/contentbank/view.php
@@@ -83,16 -83,16 +83,25 @@@ if ($contenttype->can_manage($content)
          false,
          $attributes
      ));
+ 
+     if ($contenttype->can_upload()) {
+         $actionmenu->add_secondary_action(new action_menu_link(
+             new moodle_url('/contentbank/upload.php', ['contextid' => $context->id, 'id' => $content->get_id()]),
+             new pix_icon('i/upload', get_string('upload')),
+             get_string('replacecontent', 'contentbank'),
+             false
+         ));
+     }
  }
 +if ($contenttype->can_download($content)) {
 +    // Add the download content item to the menu.
 +    $actionmenu->add_secondary_action(new action_menu_link(
 +        new moodle_url($contenttype->get_download_url($content)),
 +        new pix_icon('t/download', get_string('download')),
 +        get_string('download'),
 +        false
 +    ));
 +}
  if ($contenttype->can_delete($content)) {
      // Add the delete content item to the menu.
      $attributes = [

diff --cc lang/en/contentbank.php
Simple merge