makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

#13679

Browse source 
#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
This commit is contained in:
Henry Sudhof 2007-07-22 13:14:36 +00:00
parent 13aae51866
commit 6161658262
5 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
phpBB/docs/CHANGELOG.html
View file

@ -266,6 +266,7 @@ p a {
<li>[Fix] Allow for unicode usernames to be pruned (Bug #13643)</li> <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] 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] 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> </ul>

1
phpBB/language/en/common.php
View file

@ -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_JABBER' => 'The name you entered is not a valid Jabber account name.',
'WRONG_DATA_LANG' => 'The language you specified is not valid.', '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/.', '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' => 'Year',
'YEAR_MONTH_DAY' => '(YYYY-MM-DD)', 'YEAR_MONTH_DAY' => '(YYYY-MM-DD)',

1
phpBB/language/en/memberlist.php
View file

@ -78,6 +78,7 @@ $lang = array_merge($lang, array(
'IM_MSNM_BROWSER' => 'Your browser does not support this.', '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_MSNM_CONNECT' => 'MSNM is not connected.\nYou have to connect to MSNM to continue.',
'IM_NAME' => 'Your Name', '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_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_RECIPIENT' => 'Recipient',
'IM_SEND' => 'Send message', 'IM_SEND' => 'Send message',

1
phpBB/language/en/viewtopic.php
View file

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

6
phpBB/memberlist.php
View file

@ -316,7 +316,11 @@ switch ($mode)
if (!$row) 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 // Post data grab actions