Permalink
Browse files

Merge branch 'MDL-29563_22' of https://github.com/dmonllao/moodle int…

…o MOODLE_22_STABLE
  • Loading branch information...
2 parents 465775f + e352a32 commit 71268ddb625d110db3de4e8125d0a5182217fbbd Sam Hemelryk committed Jul 22, 2012
Showing with 12 additions and 6 deletions.
  1. +2 −2 course/lib.php
  2. +9 −4 course/modduplicate.php
  3. +1 −0 lang/en/moodle.php
View
@@ -3213,8 +3213,8 @@ function make_editing_buttons(stdClass $mod, $absolute_ignored = true, $movesele
);
}
- // Duplicate (require both target import caps to be able to duplicate, see modduplicate.php)
- if (has_all_capabilities($dupecaps, $coursecontext)) {
+ // Duplicate (require both target import caps to be able to duplicate and backup2 support, see modduplicate.php)
+ if (has_all_capabilities($dupecaps, $coursecontext) && plugin_supports('mod', $mod->modname, FEATURE_BACKUP_MOODLE2)) {
$actions[] = new action_link(
new moodle_url($baseurl, array('duplicate' => $mod->id)),
new pix_icon('t/copy', $str->duplicate, 'moodle', array('class' => 'iconsmall')),
View
@@ -55,6 +55,15 @@
$output = $PAGE->get_renderer('core', 'backup');
+$a = new stdClass();
+$a->modtype = get_string('modulename', $cm->modname);
+$a->modname = format_string($cm->name);
+
+if (!plugin_supports('mod', $cm->modname, FEATURE_BACKUP_MOODLE2)) {
+ $url = new moodle_url('/course/view.php#section-' . $cm->sectionnum, array('id' => $course->id));
+ print_error('duplicatenosupport', 'core', $url, $a);
+}
+
// backup the activity
$bc = new backup_controller(backup::TYPE_1ACTIVITY, $cm->id, backup::FORMAT_MOODLE,
@@ -117,10 +126,6 @@
fulldelete($backupbasepath);
}
-$a = new stdClass();
-$a->modtype = get_string('modulename', $cm->modname);
-$a->modname = format_string($cm->name);
-
echo $output->header();
if ($newcmid) {
View
@@ -465,6 +465,7 @@
$string['duplicateconfirm'] = 'Are you sure you want to duplicate {$a->modtype} \'{$a->modname}\' ?';
$string['duplicatecontcourse'] = 'Return to the course';
$string['duplicatecontedit'] = 'Edit the new copy';
+$string['duplicatenosupport'] = '\'{$a->modname}\' activity could not be duplicated because the {$a->modtype} module does not support backup and restore.';
$string['duplicatesuccess'] = '{$a->modtype} \'{$a->modname}\' has been duplicated successfully';
$string['duplicatinga'] = 'Duplicating: {$a}';
$string['edhelpaspellpath'] = 'To use spell-checking within the editor, you MUST have <strong>aspell 0.50</strong> or later installed on your server, and you must specify the correct path to access the aspell binary. On Unix/Linux systems, this path is usually <strong>/usr/bin/aspell</strong>, but it might be something else.';

0 comments on commit 71268dd

Please sign in to comment.