Merge branch 'MDL-31500_master' of git://github.com/dmonllao/moodle

Conflicts:
	backup/util/ui/renderer.php

diff --cc backup/util/ui/renderer.php
index 98ed652,82bcf8f..d5d0f11
--- 1/backup/util/ui/renderer.php
--- 2/backup/util/ui/renderer.php
+++ b/backup/util/ui/renderer.php
@@@ -301,12 -303,7 +303,12 @@@ class core_backup_renderer extends plug
              $html .= html_writer::end_tag('form');
          }
  
-         if (!empty($courses) && ($courses->get_count() > 0 || $courses->get_search())) {
 +        // If we are restoring an activity, then include the current course.
 +        if (!$wholecourse) {
 +            $courses->invalidate_results(); // Clean list of courses.
 +            $courses->set_include_currentcourse();
 +        }
+         if (!empty($courses) && ($courses->get_count() > 0 || $courses->get_search()) && $currentcourse != SITEID) {
              // Existing course
              $hasrestoreoption = true;
              $html .= $form;