#13679

#13681
#13683

Adding finer error conditions to the IM contact page.
Adds one language entry, moves one from viewtopic to common.


git-svn-id: file:///svn/phpbb/trunk@7918 89ea8834-ac86-4346-8a33-228a782c2dd0

phpBB/docs/CHANGELOG.html

@@ -266,6 +266,7 @@ p a {
 		<li>[Fix] Allow for unicode usernames to be pruned (Bug #13643)</li>
 		<li>[Fix] Do not copy forum permissions from self (Bug #13663)</li>
 		<li>[Fix] Allow for polls to work during preview (Bug #13657) - thanks to Thatbitextra</li>
+		<li>[Fix] Finer error conditions for sending IM messages (Bugs #13681, #13683)</li>
 
 
 	</ul>

phpBB/language/en/common.php

@@ -646,6 +646,7 @@ $lang = array_merge($lang, array(
 	'WRONG_DATA_JABBER'			=> 'The name you entered is not a valid Jabber account name.',
 	'WRONG_DATA_LANG'			=> 'The language you specified is not valid.',
 	'WRONG_DATA_WEBSITE'		=> 'The website address has to be a valid URL, including the protocol. For example http://www.example.com/.',
+	'WROTE'						=> 'wrote',
 
 	'YEAR'				=> 'Year',
 	'YEAR_MONTH_DAY'	=> '(YYYY-MM-DD)',

phpBB/language/en/memberlist.php

@@ -78,6 +78,7 @@ $lang = array_merge($lang, array(
 	'IM_MSNM_BROWSER'		=> 'Your browser does not support this.',
 	'IM_MSNM_CONNECT'		=> 'MSNM is not connected.\nYou have to connect to MSNM to continue.',		
 	'IM_NAME'				=> 'Your Name',
+	'IM_NO_DATA'			=> 'There is no suitable contact information for this user.',
 	'IM_NO_JABBER'			=> 'Sorry, direct messaging of Jabber users is not supported on this server. You will need a Jabber client installed on your system to contact the recipient above.',
 	'IM_RECIPIENT'			=> 'Recipient',
 	'IM_SEND'				=> 'Send message',

phpBB/language/en/viewtopic.php

@@ -101,7 +101,6 @@ $lang = array_merge($lang, array(
 	'VISIT_WEBSITE'			=> 'WWW',
 	'VOTE_SUBMITTED'		=> 'Your vote has been cast.',
 
-	'WROTE'					=> 'wrote',
 ));
 
 ?>

phpBB/memberlist.php

@@ -316,7 +316,11 @@ switch ($mode)
 
 		if (!$row)
 		{
-			trigger_error('NO_USER_DATA');
+			trigger_error('NO_USER');
+		}
+		else if (empty($row[$sql_field]))
+		{
+			trigger_error('IM_NO_DATA');
 		}
 
 		// Post data grab actions