Merge branch 'MDL-43570' of https://github.com/KristerV/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 1 May 2014 06:43:22 +0000 (14:43 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 1 May 2014 06:43:22 +0000 (14:43 +0800)
Conflicts:
version.php

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

@@@ -3612,5 -3624,21 +3612,21 @@@ function xmldb_main_upgrade($oldversion
          upgrade_main_savepoint(true, 2014041500.01);
      }
  
 -    if ($oldversion < 2014043000.00) {
 -            // Fixing possible wrong MIME type for DigiDoc files.
 -            $extensions = array('%.bdoc', '%.cdoc', '%.ddoc');
 -            $select = $DB->sql_like('filename', '?', false);
 -            foreach ($extensions as $extension) {
 -                $DB->set_field_select(
 -                    'files',
 -                    'mimetype',
 -                    'application/x-digidoc',
 -                    $select,
 -                    array($extension)
 -                );
 -            }
 -            upgrade_main_savepoint(true, 2014043000.00);
++    if ($oldversion < 2014050100.00) {
++        // Fixing possible wrong MIME type for DigiDoc files.
++        $extensions = array('%.bdoc', '%.cdoc', '%.ddoc');
++        $select = $DB->sql_like('filename', '?', false);
++        foreach ($extensions as $extension) {
++            $DB->set_field_select(
++                'files',
++                'mimetype',
++                'application/x-digidoc',
++                $select,
++                array($extension)
++            );
+         }
++        upgrade_main_savepoint(true, 2014050100.00);
++    }
      return true;
  }
diff --cc version.php
@@@ -29,7 -29,7 +29,7 @@@
  
  defined('MOODLE_INTERNAL') || die();
  
- $version  = 2014042900.00;              // YYYYMMDD      = weekly release date of this DEV branch.
 -$version  = 2014043000.00;              // YYYYMMDD      = weekly release date of this DEV branch.
++$version  = 2014050100.00;              // YYYYMMDD      = weekly release date of this DEV branch.
                                          //         RR    = release increments - 00 in DEV branches.
                                          //           .XX = incremental changes.