summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorDavid Rothstein <drothstein@gmail.com>2015-03-29 22:46:20 -0400
committerDavid Rothstein <drothstein@gmail.com>2015-03-29 22:46:20 -0400
commit2ace1905b59b779a87e3ad1a125d5bb52193aa61 (patch)
tree926d08774073e615447e54ffd4bc54e0808256db /modules
parent25ddf78e41129890dd671b9c8c4f817bfc411200 (diff)
downloadbrdo-2ace1905b59b779a87e3ad1a125d5bb52193aa61.tar.gz
brdo-2ace1905b59b779a87e3ad1a125d5bb52193aa61.tar.bz2
Issue #1882774 by David_Rothstein, iva2k: User pictures are lost when system_update_7061 merges files into {file_managed}.
Diffstat (limited to 'modules')
-rw-r--r--modules/user/user.install10
1 files changed, 6 insertions, 4 deletions
diff --git a/modules/user/user.install b/modules/user/user.install
index 4e1a3c22d..728e00468 100644
--- a/modules/user/user.install
+++ b/modules/user/user.install
@@ -356,11 +356,13 @@ function user_update_dependencies() {
'filter' => 7000,
);
- // user_update_7012() uses the file API, which relies on the {file_managed}
- // table, so it must run after system_update_7034(), which creates that
- // table.
+ // user_update_7012() uses the file API and inserts records into the
+ // {file_managed} table, so it therefore must run after system_update_7061(),
+ // which inserts files with specific IDs into the table and therefore relies
+ // on the table being empty (otherwise it would accidentally overwrite
+ // existing records).
$dependencies['user'][7012] = array(
- 'system' => 7034,
+ 'system' => 7061,
);
// user_update_7013() uses the file usage API, which relies on the