Merge branch 'MDL-38557' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 26 Mar 2013 22:38:07 +0000 (23:38 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 26 Mar 2013 22:38:07 +0000 (23:38 +0100)
Conflicts:
lib/db/upgrade.php
version.php

1  2 
lib/db/upgrade.php
version.php

@@@ -1757,27 -1757,12 +1757,34 @@@ function xmldb_main_upgrade($oldversion
      }
  
      if ($oldversion < 2013032200.01) {
 -
 -        upgrade_main_savepoint(true, 2013032200.01);
 +        // GD is now always available
 +        set_config('gdversion', 2);
 +
 +        upgrade_main_savepoint(true, 2013032200.01);
 +    }
 +
 +    if ($oldversion < 2013032600.03) {
 +        // Fixing possible wrong MIME type for MIME HTML (MHTML) files.
 +        $extensions = array('%.mht', '%.mhtml');
 +        $select = $DB->sql_like('filename', '?', false);
 +        foreach ($extensions as $extension) {
 +            $DB->set_field_select(
 +                'files',
 +                'mimetype',
 +                'message/rfc822',
 +                $select,
 +                array($extension)
 +            );
 +        }
 +        upgrade_main_savepoint(true, 2013032600.03);
 +    }
 +
++    if ($oldversion < 2013032600.04) {
+         // MDL-31983 broke the quiz version number. Fix it.
+         $DB->set_field('modules', 'version', '2013021500',
+                 array('name' => 'quiz', 'version' => '2013310100'));
++        upgrade_main_savepoint(true, 2013032600.04);
+     }
      return true;
  }
diff --cc version.php
@@@ -29,7 -29,7 +29,7 @@@
  
  defined('MOODLE_INTERNAL') || die();
  
- $version  = 2013032600.03;              // YYYYMMDD      = weekly release date of this DEV branch
 -$version  = 2013032200.01;              // YYYYMMDD      = weekly release date of this DEV branch
++$version  = 2013032600.04;              // YYYYMMDD      = weekly release date of this DEV branch
                                          //         RR    = release increments - 00 in DEV branches
                                          //           .XX = incremental changes