|
|
@@ -100,7 +100,7 @@ while (!$is_done)
|
|
|
$fileHash = '';
|
|
|
|
|
|
$request = upgrade_query("
|
|
|
- SELECT id_attach, id_folder, filename, file_hash, mime_type
|
|
|
+ SELECT id_attach, id_member, id_folder, filename, file_hash, mime_type
|
|
|
FROM {$db_prefix}attachments
|
|
|
WHERE attachment_type != 1
|
|
|
LIMIT $_GET[a], 100");
|
|
|
@@ -1055,12 +1055,19 @@ ADD COLUMN in_inbox tinyint(3) NOT NULL default '1';
|
|
|
{
|
|
|
// Keep track of the index of this label - we'll need that in a bit...
|
|
|
$label_info[$row['id_member']][$label] = $index;
|
|
|
- $inserts[] = array($row['id_member'], $label);
|
|
|
}
|
|
|
}
|
|
|
|
|
|
$smcFunc['db_free_result']($get_labels);
|
|
|
|
|
|
+ foreach ($label_info AS $id_member => $labels)
|
|
|
+ {
|
|
|
+ foreach ($labels as $label => $index)
|
|
|
+ {
|
|
|
+ $inserts[] = array($id_member, $label);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
if (!empty($inserts))
|
|
|
{
|
|
|
$smcFunc['db_insert']('', '{db_prefix}pm_labels', array('id_member' => 'int', 'name' => 'string-30'), $inserts, array());
|
|
|
@@ -1092,8 +1099,8 @@ ADD COLUMN in_inbox tinyint(3) NOT NULL default '1';
|
|
|
while ($label_row = $smcFunc['db_fetch_assoc']($get_new_label_ids))
|
|
|
{
|
|
|
// Map the old index values to the new ID values...
|
|
|
- $old_index = $label_info[$row['id_member']][$row['label_name']];
|
|
|
- $label_info_2[$row['id_member']][$old_index] = $row['id_label'];
|
|
|
+ $old_index = $label_info[$label_row['id_member']][$label_row['name']];
|
|
|
+ $label_info_2[$label_row['id_member']][$old_index] = $label_row['id_label'];
|
|
|
}
|
|
|
|
|
|
$smcFunc['db_free_result']($get_new_label_ids);
|
Noteworthy Software, Inc