diff options
| author | Henry Sudhof <kellanved@phpbb.com> | 2007-07-22 13:14:36 +0000 |
|---|---|---|
| committer | Henry Sudhof <kellanved@phpbb.com> | 2007-07-22 13:14:36 +0000 |
| commit | 61616582628fa1b6e61f5522d3e64c454e66bb5d (patch) | |
| tree | bcde52619fecdd16e662ee02a03fa4f6353f7156 | |
| parent | 13aae518665d1f01aee075efe15aba68c1f3576b (diff) | |
| download | forums-61616582628fa1b6e61f5522d3e64c454e66bb5d.tar forums-61616582628fa1b6e61f5522d3e64c454e66bb5d.tar.gz forums-61616582628fa1b6e61f5522d3e64c454e66bb5d.tar.bz2 forums-61616582628fa1b6e61f5522d3e64c454e66bb5d.tar.xz forums-61616582628fa1b6e61f5522d3e64c454e66bb5d.zip | |
#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
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 1 | ||||
| -rw-r--r-- | phpBB/language/en/common.php | 1 | ||||
| -rw-r--r-- | phpBB/language/en/memberlist.php | 1 | ||||
| -rw-r--r-- | phpBB/language/en/viewtopic.php | 1 | ||||
| -rw-r--r-- | phpBB/memberlist.php | 6 |
5 files changed, 8 insertions, 2 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index a821985f4c..4654cbe9ed 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/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> diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 92637d37be..fe528d48fe 100644 --- a/phpBB/language/en/common.php +++ b/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)', diff --git a/phpBB/language/en/memberlist.php b/phpBB/language/en/memberlist.php index 6feb16c02c..c4a392c81d 100644 --- a/phpBB/language/en/memberlist.php +++ b/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', diff --git a/phpBB/language/en/viewtopic.php b/phpBB/language/en/viewtopic.php index aec904eddc..59d3371f45 100644 --- a/phpBB/language/en/viewtopic.php +++ b/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', )); ?>
\ No newline at end of file diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php index a7da629de4..a93622065f 100644 --- a/phpBB/memberlist.php +++ b/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 |