mirror of
https://github.com/moodle/moodle.git
synced 2025-03-14 04:30:15 +01:00
merged fix for 5426
This commit is contained in:
parent
203003ae8c
commit
e503f30d10
@ -362,7 +362,7 @@
|
||||
migrate2utf8_course_fullname(RECORDID)
|
||||
</PHP_FUNCTION>
|
||||
</FIELD>
|
||||
<FIELD name="shortname" method="PHP_FUNCTION" type="varchar" length="100" dropindex="shortname" addindex="shortname(shortname(15))">
|
||||
<FIELD name="shortname" method="PHP_FUNCTION" type="varchar" length="100" dropindex="shortname" addindex="shortname(shortname(100))">
|
||||
<PHP_FUNCTION>
|
||||
migrate2utf8_course_shortname(RECORDID)
|
||||
</PHP_FUNCTION>
|
||||
@ -426,12 +426,12 @@
|
||||
migrate2utf8_user_idnumber(RECORDID)
|
||||
</PHP_FUNCTION>
|
||||
</FIELD>
|
||||
<FIELD name="firstname" method="PHP_FUNCTION" type="varchar" length="100" dropindex="user_firstname" addindex="user_firstname(firstname(20))">
|
||||
<FIELD name="firstname" method="PHP_FUNCTION" type="varchar" length="100" dropindex="user_firstname" addindex="user_firstname(firstname(100))">
|
||||
<PHP_FUNCTION>
|
||||
migrate2utf8_user_firstname(RECORDID)
|
||||
</PHP_FUNCTION>
|
||||
</FIELD>
|
||||
<FIELD name="lastname" method="PHP_FUNCTION" type="varchar" length="100" dropindex="user_lastname" addindex="user_lastname(lastname(20))">
|
||||
<FIELD name="lastname" method="PHP_FUNCTION" type="varchar" length="100" dropindex="user_lastname" addindex="user_lastname(lastname(100))">
|
||||
<PHP_FUNCTION>
|
||||
migrate2utf8_user_lastname(RECORDID)
|
||||
</PHP_FUNCTION>
|
||||
|
@ -1921,6 +1921,28 @@ function main_upgrade($oldversion=0) {
|
||||
table_column('user','url','url','varchar','255','','','not null');
|
||||
}
|
||||
|
||||
|
||||
if ($oldversion < 2006050400) {
|
||||
|
||||
execute_sql("ALTER TABLE `{$CFG->prefix}user` DROP INDEX {$CFG->prefix}user_deleted_idx;",false);
|
||||
execute_sql("ALTER TABLE `{$CFG->prefix}user` DROP INDEX {$CFG->prefix}user_confirmed_idx;",false);
|
||||
execute_sql("ALTER TABLE `{$CFG->prefix}user` DROP INDEX {$CFG->prefix}user_firstname_idx;",false);
|
||||
execute_sql("ALTER TABLE `{$CFG->prefix}user` DROP INDEX {$CFG->prefix}user_lastname_idx;",false);
|
||||
execute_sql("ALTER TABLE `{$CFG->prefix}user` DROP INDEX {$CFG->prefix}user_city_idx;",false);
|
||||
execute_sql("ALTER TABLE `{$CFG->prefix}user` DROP INDEX {$CFG->prefix}user_country_idx;",false);
|
||||
execute_sql("ALTER TABLE `{$CFG->prefix}user` DROP INDEX {$CFG->prefix}user_lastaccess_idx;",false);
|
||||
execute_sql("ALTER TABLE `{$CFG->prefix}user` DROP INDEX {$CFG->prefix}user_email_idx;",false);
|
||||
|
||||
execute_sql("ALTER TABLE `{$CFG->prefix}user` ADD INDEX user_deleted (deleted)",false);
|
||||
execute_sql("ALTER TABLE `{$CFG->prefix}user` ADD INDEX user_confirmed (confirmed)",false);
|
||||
execute_sql("ALTER TABLE `{$CFG->prefix}user` ADD INDEX user_firstname (firstname)",false);
|
||||
execute_sql("ALTER TABLE `{$CFG->prefix}user` ADD INDEX user_lastname (lastname)",false);
|
||||
execute_sql("ALTER TABLE `{$CFG->prefix}user` ADD INDEX user_city (city)",false);
|
||||
execute_sql("ALTER TABLE `{$CFG->prefix}user` ADD INDEX user_country (country)",false);
|
||||
execute_sql("ALTER TABLE `{$CFG->prefix}user` ADD INDEX user_lastaccess (lastaccess)",false);
|
||||
execute_sql("ALTER TABLE `{$CFG->prefix}user` ADD INDEX user_email (email)",false);
|
||||
}
|
||||
|
||||
return $result;
|
||||
}
|
||||
|
||||
|
@ -6,7 +6,7 @@
|
||||
// This is compared against the values stored in the database to determine
|
||||
// whether upgrades should be performed (see lib/db/*.php)
|
||||
|
||||
$version = 2006050300; // YYYYMMDD = date
|
||||
$version = 2006050400; // YYYYMMDD = date
|
||||
// XY = increments within a single day
|
||||
|
||||
$release = '1.7 dev'; // Human-friendly version name
|
||||
|
Loading…
x
Reference in New Issue
Block a user