Withoutaname has uploaded a new change for review.
https://gerrit.wikimedia.org/r/133411
Change subject: Add user_password_expires before running ConvertUserOptions.php
......................................................................
Add user_password_expires before running ConvertUserOptions.php
Fixing updater to add the user_password_expires field onto
the user table before running ConvertUserOptions.php, when calling
doMigrateUserOptions() in DatabaseUpdater.php. Hopefully, addField()
is smart enough to skip the process if the table/field already exists.
Bug: 63677
Change-Id: I26822d97f40e9b853bac5171e7c16fc1b32c648c
---
M includes/installer/DatabaseUpdater.php
1 file changed, 3 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/11/133411/1
diff --git a/includes/installer/DatabaseUpdater.php
b/includes/installer/DatabaseUpdater.php
index 82a358e..91eca37 100644
--- a/includes/installer/DatabaseUpdater.php
+++ b/includes/installer/DatabaseUpdater.php
@@ -1023,6 +1023,9 @@
* Migrates user options from the user table blob to user_properties
*/
protected function doMigrateUserOptions() {
+ if ( !$this->db->fieldExists( 'user', 'user_password_expires',
__METHOD__ ) ) {
+ $this->addField( 'user', 'user_password_expires',
'patch-user_password_expire.sql' );
+ }
if ( $this->db->tableExists( 'user_properties' ) ) {
$cl = $this->maintenance->runChild(
'ConvertUserOptions', 'convertUserOptions.php' );
$cl->execute();
--
To view, visit https://gerrit.wikimedia.org/r/133411
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I26822d97f40e9b853bac5171e7c16fc1b32c648c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Withoutaname <drevit...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
