Merge branch 'MDL-71174' of git://github.com/danmarsden/moodle

diff --combined lib/plagiarismlib.php
index bfdb676,cb0e521..d8e246e
--- 1/lib/plagiarismlib.php
--- 2/lib/plagiarismlib.php
+++ b/lib/plagiarismlib.php
@@@ -47,10 -47,7 +47,10 @@@ function plagiarism_get_links($linkarra
          $plagiarismplugin = new $plagiarismclass;
          $output .= $plagiarismplugin->get_links($linkarray);
      }
 -    return $output;
 +    if (!empty($output)) {
 +        return html_writer::span($output, 'core_plagiarism_links');
 +    }
 +    return '';
  }
  
  /**
@@@ -138,7 -135,7 +138,7 @@@ function plagiarism_get_form_elements_m
      }
  }
  /**
-  * updates the status of all files within a module
+  * Allows a plagiarism plugin to print a button/link at the top of activity overview report pages.
   *
   * @param object $course - full Course object
   * @param object $cm - full cm object