1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-26 17:54:39 +02:00

- 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
This commit is contained in:
Meik Sievertsen
2006-07-20 21:45:24 +00:00
parent 3f3db8cdaa
commit 73ac6b1423
19 changed files with 56 additions and 42 deletions

View File

@@ -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,
);
}