diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-07-20 21:45:24 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-07-20 21:45:24 +0000 |
| commit | 73ac6b142375eaff4679a205a6bae537e4d019ac (patch) | |
| tree | 0257aa7d9985d75d5d1cd79d1bd87332e55f303c /phpBB/memberlist.php | |
| parent | 3f3db8cdaa8a8066ee0f727fe44699a179aca04e (diff) | |
| download | forums-73ac6b142375eaff4679a205a6bae537e4d019ac.tar forums-73ac6b142375eaff4679a205a6bae537e4d019ac.tar.gz forums-73ac6b142375eaff4679a205a6bae537e4d019ac.tar.bz2 forums-73ac6b142375eaff4679a205a6bae537e4d019ac.tar.xz forums-73ac6b142375eaff4679a205a6bae537e4d019ac.zip | |
- some bugfixes
- set ip_check to A.B.C. by default
- display postings in other encodings by default and present link to force the encoding as usual.
git-svn-id: file:///svn/phpbb/trunk@6198 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/memberlist.php')
| -rw-r--r-- | phpBB/memberlist.php | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php index 829997019c..d1ae94c779 100644 --- a/phpBB/memberlist.php +++ b/phpBB/memberlist.php @@ -648,10 +648,12 @@ switch ($mode) 'email_lang' => $email_lang, 'email' => $email, 'name' => $name, - 'username' => $row['username'], + 'username' => ($user_id) ? $row['username'] : '', 'to_name' => $name, - 'user_jabber' => $row['user_jabber'], - 'user_notify_type' => $row['user_notify_type'], + 'user_jabber' => ($user_id) ? $row['user_jabber'] : '', + 'user_notify_type' => ($user_id) ? $row['user_notify_type'] : NOTIFY_EMAIL, + 'topic_title' => (!$user_id) ? $row['topic_title'] : '', + 'forum_id' => (!$user_id) ? $row['forum_id'] : 0, ); // Ok, now the same email if CC specified, but without exposing the users email address @@ -665,6 +667,8 @@ switch ($mode) 'to_name' => $name, 'user_jabber' => $user->data['user_jabber'], 'user_notify_type' => ($user_id) ? $user->data['user_notify_type'] : NOTIFY_EMAIL, + 'topic_title' => (!$user_id) ? $row['topic_title'] : '', + 'forum_id' => (!$user_id) ? $row['forum_id'] : 0, ); } |