Permalink
Browse files

MDL-33812 Backup: Revert MDL-33521

Conflicts:

	backup/util/helper/backup_cron_helper.class.php
  • Loading branch information...
1 parent cdf58e6 commit 85616ca24f4a0d5fcc3eae9d8ff6876caa444d84 @FMCorz FMCorz committed Aug 21, 2012
Showing with 1 addition and 11 deletions.
  1. +1 −11 backup/util/helper/backup_cron_helper.class.php
@@ -530,17 +530,7 @@ public static function remove_excess_backups($course) {
if (!empty($dir) && ($storage == 1 || $storage == 2)) {
// Calculate backup filename regex, ignoring the date/time/info parts that can be
// variable, depending of languages, formats and automated backup settings
-
- // MDL-33531: use different filenames depending on backup_shortname option
- if ( !empty($config->backup_shortname) ) {
- $context = get_context_instance(CONTEXT_COURSE, $course->id);
- $courseref = format_string($course->shortname, true, array('context' => $context));
- $courseref = str_replace(' ', '_', $courseref);
- $courseref = moodle_strtolower(trim(clean_filename($courseref), '_'));
- } else {
- $courseref = $course->id;
- }
- $filename = $backupword . '-' . backup::FORMAT_MOODLE . '-' . backup::TYPE_1COURSE . '-' .$courseref . '-';
+ $filename = $backupword . '-' . backup::FORMAT_MOODLE . '-' . backup::TYPE_1COURSE . '-' .$course->id . '-';
$regex = '#^'.preg_quote($filename, '#').'.*\.mbz$#';
// Store all the matching files into fullpath => timemodified array

0 comments on commit 85616ca

Please sign in to comment.