Permalink
Browse files

MDL-33531 Fixed the regexp used to find old backup files

  • Loading branch information...
nicusX authored and dmonllao committed Jun 10, 2012
1 parent c36de79 commit dcc36c3aa2041665e5b77c63e29531f2e7b3d64e
Showing with 10 additions and 1 deletion.
  1. +10 −1 backup/util/helper/backup_cron_helper.class.php
@@ -508,7 +508,16 @@ 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
- $filename = $backupword . '-' . backup::FORMAT_MOODLE . '-' . backup::TYPE_1COURSE . '-' .$course->id . '-';
+
+ // MDL-33531: use different filenames depending on backup_shortname option
+ if ( $config->backup_shortname ) {
+ $courseref = $course->shortname;
+ $courseref = str_replace(' ', '_', $courseref);
+ $courseref = moodle_strtolower(trim(clean_filename($courseref), '_'));
+ } else {
+ $courseref = $course->id;
+ }
+ $filename = $backupword . '-' . backup::FORMAT_MOODLE . '-' . backup::TYPE_1COURSE . '-' .$courseref . '-';
$regex = '#^'.preg_quote($filename, '#').'.*\.mbz$#';
// Store all the matching files into fullpath => timemodified array

0 comments on commit dcc36c3

Please sign in to comment.