! More bugfixes

Signed-off-by: Michael Eshom <[email protected]>

Sources/PersonalMessage.php

@@ -108,7 +108,7 @@ function MessageMain()
 				AND in_inbox = {int:in_inbox}',
 			array(
 				'current_member' => $user_info['id'],
-				'in_inbox' => 0,
+				'in_inbox' => 1,
 			)
 		);
 		
@@ -3196,7 +3196,7 @@ function ManageLabels()
 			$inserts = array();
 			foreach($labels_to_add AS $label)
 			{
-				$inserts[] = array($label, $user_info['id']);
+				$inserts[] = array($user_info['id'], $label);
 			}
 			
 			$smcFunc['db_insert']('', '{db_prefix}pm_labels', array('id_member' => 'int', 'name' => 'string-30'), $inserts, array());

Themes/default/PersonalMessage.template.php

@@ -1829,7 +1829,7 @@ function template_add_rule()
 		foreach ($context['labels'] as $label)
 			if ($label['id'] != -1)
 				echo '
-							<option value="', ($label['id'] + 1), '" ', $action['t'] == 'lab' && $action['v'] == $label['id'] ? 'selected="selected"' : '', '>', $label['name'], '</option>';
+							<option value="', ($label['id']), '" ', $action['t'] == 'lab' && $action['v'] == $label['id'] ? 'selected="selected"' : '', '>', $label['name'], '</option>';
 
 		echo '
 						</select>

other/upgrade_2-1_mysql.sql

@@ -637,7 +637,7 @@ ADD COLUMN in_inbox tinyint(3) NOT NULL default '0';
 		$smcFunc['db_query']('', '
 			UPDATE {db_prefix}pm_recipients
 			SET in_inbox = {int:in_inbox}
-			WHERE FIND_IN_SET({int:minusone}, message_labels)',
+			WHERE FIND_IN_SET({int:minusone}, labels)',
 			array(
 				'in_inbox' => 1,
 				'minusone' => -1,

other/upgrade_2-1_postgresql.sql

@@ -720,7 +720,7 @@ ADD COLUMN in_inbox smallint NOT NULL default '0';
 		$smcFunc['db_query']('', '
 			UPDATE {db_prefix}pm_recipients
 			SET in_inbox = {int:in_inbox}
-			WHERE FIND_IN_SET({int:minus_one}, message_labels)',
+			WHERE FIND_IN_SET({int:minus_one}, labels)',
 			array(
 				'in_inbox' => 1,
 				'minus_one' => -1,

other/upgrade_2-1_sqlite.sql

@@ -697,7 +697,7 @@ ADD COLUMN in_inbox tinyint(3) NOT NULL default '0';
 		$smcFunc['db_query']('', '
 			UPDATE {db_prefix}pm_recipients
 			SET in_inbox = {int:in_inbox}
-			WHERE FIND_IN_SET({int:minus_one}, message_labels)',
+			WHERE FIND_IN_SET({int:minus_one}, labels)',
 			array(
 				'in_inbox' => 1,
 				'minus_one' => -1,