Merge branch 'MOODLE_22_STABLE' into install_22_STABLE

moodle · Jan 26, 2013 · 1efcb6e · 1efcb6e
2 parents b7e0189 + 8c40b4e
commit 1efcb6e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/mod/resource/db/upgrade.php b/mod/resource/db/upgrade.php
@@ -128,7 +128,7 @@ function xmldb_resource_upgrade($oldversion) {
             $dbman->add_field($table, $field);
         }
         // Define field mainfile to be added to resource
-        $field = new xmldb_field('mainfile', XMLDB_TYPE_CHAR, '255', null, null, null, null, 'tobemigrated');
+        $field = new xmldb_field('mainfile', XMLDB_TYPE_CHAR, '256', null, null, null, null, 'tobemigrated');
         // Conditionally launch add field mainfile
         if (!$dbman->field_exists($table, $field)) {
             $dbman->add_field($table, $field);

diff --git a/version.php b/version.php
@@ -30,10 +30,10 @@
 defined('MOODLE_INTERNAL') || die();
 
 
-$version  = 2011120507.01;              // 20111205      = branching date YYYYMMDD - do not modify!
+$version  = 2011120507.02;              // 20111205      = branching date YYYYMMDD - do not modify!
                                         //         RR    = release increments - 00 in DEV branches
                                         //           .XX = incremental changes
 
-$release  = '2.2.7+ (Build: 20130118)';  // Human-friendly version name
+$release  = '2.2.7+ (Build: 20130125)';  // Human-friendly version name
 
 $maturity = MATURITY_STABLE;            // this version's maturity level