Merge branch 'w18_MDL-32628_m23_avatarperf2' of git://github.com/skodak/moodle
authorDan Poltawski <dan@moodle.com>
Fri, 4 May 2012 01:28:41 +0000 (09:28 +0800)
committerDan Poltawski <dan@moodle.com>
Fri, 4 May 2012 01:28:41 +0000 (09:28 +0800)
Conflicts:
    lib/db/upgrade.php
version.php

1  2 
lib/db/upgrade.php
lib/filelib.php
lib/moodlelib.php
lib/outputrenderers.php
user/editlib.php
version.php

@@@ -422,5 -422,24 +422,24 @@@ function xmldb_main_upgrade($oldversion
          upgrade_main_savepoint(true, 2012042300.02);
      }
  
 -    if ($oldversion < 2012042700.01) {
++    if ($oldversion < 2012050300.01) {
+         // Make sure deleted users do not have picture flag.
+         $DB->set_field('user', 'picture', 0, array('deleted'=>1, 'picture'=>1));
 -        upgrade_main_savepoint(true, 2012042700.01);
++        upgrade_main_savepoint(true, 2012050300.01);
+     }
 -    if ($oldversion < 2012042700.02) {
++    if ($oldversion < 2012050300.02) {
+         // Changing precision of field picture on table user to (10)
+         $table = new xmldb_table('user');
+         $field = new xmldb_field('picture', XMLDB_TYPE_INTEGER, '10', null, XMLDB_NOTNULL, null, '0', 'secret');
+         // Launch change of precision for field picture
+         $dbman->change_field_precision($table, $field);
+         // Main savepoint reached
 -        upgrade_main_savepoint(true, 2012042700.02);
++        upgrade_main_savepoint(true, 2012050300.02);
+     }
      return true;
  }
diff --cc lib/filelib.php
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc version.php
@@@ -30,7 -30,7 +30,7 @@@
  defined('MOODLE_INTERNAL') || die();
  
  
- $version  = 2012050300.00;              // YYYYMMDD      = weekly release date of this DEV branch
 -$version  = 2012042700.02;              // YYYYMMDD      = weekly release date of this DEV branch
++$version  = 2012050300.02;              // YYYYMMDD      = weekly release date of this DEV branch
                                          //         RR    = release increments - 00 in DEV branches
                                          //           .XX = incremental changes