diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2008-12-03 16:48:06 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2008-12-03 16:48:06 +0000 |
| commit | 866e4196f4f50a41a1f176a17cc56609a13d4a10 (patch) | |
| tree | d097a59d52bf55788b119b3f25913c6b7f5ea90c | |
| parent | 88ddcceb3bf8c15fee9c9bf0aee090bd9cab3fec (diff) | |
| download | forums-866e4196f4f50a41a1f176a17cc56609a13d4a10.tar forums-866e4196f4f50a41a1f176a17cc56609a13d4a10.tar.gz forums-866e4196f4f50a41a1f176a17cc56609a13d4a10.tar.bz2 forums-866e4196f4f50a41a1f176a17cc56609a13d4a10.tar.xz forums-866e4196f4f50a41a1f176a17cc56609a13d4a10.zip | |
every second commit an pre/post-commit error... :/
Ask for forum password if post within passworded forum quoted in private message (Reported by nickvergessen)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9168 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 4 | ||||
| -rw-r--r-- | phpBB/includes/ucp/ucp_pm_compose.php | 19 |
2 files changed, 22 insertions, 1 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 844254bf22..8185eba3a0 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -99,6 +99,7 @@ <li>[Fix] Adjusted phpbb_chmod() to always set permissions for group bit.</li> <li>[Fix] Do not increment users post count after post approval if post had been posted in a forum with no post count increasing set (Bug #37865)</li> <li>[Fix] Extend vertical line for last post column if no posts in forum (Bug #37125)</li> + <li>[Fix] correctly update last topic/forum information if changing guest usernames through editing posts (Bug #38095)</li> <li>[Change] Alllow applications to set custom module inclusion path (idea by HoL)</li> <li>[Change] Handle checking for duplicate usernames in chunks (Bug #17285 - Patch by A_Jelly_Doughnut)</li> <li>[Change] Better handling and finer control for custom profile fields visibility options. (Patch by Highway of Life)</li> @@ -107,7 +108,8 @@ <li>[Change] Performance increase for get_username_string() (Bug #37545 - Patch by BartVB)</li> <li>[Change] Slight performance increase for common parameter calls to append_sid() (Bug #37555 - Patch by BartVB)</li> <li>[Feature] Added 'AGO' setting to relative date strings. For example: posted 14 minutes ago. (Patch by BartVB)</li> - <li>[Sec] Fixed an issue where deactivated accounts could be re-activated without the required privileges.(Thanks Jorick)</li> + <li>[Sec] Fixed an issue where deactivated accounts could be re-activated without the required privileges. (Reported by Jorick)</li> + <li>[Sec] Ask for forum password if post within passworded forum quoted in private message. (Reported by nickvergessen)</li> </ul> <a name="v302"></a><h3>1.ii. Changes since 3.0.2</h3> diff --git a/phpBB/includes/ucp/ucp_pm_compose.php b/phpBB/includes/ucp/ucp_pm_compose.php index ba06315363..d451e25be4 100644 --- a/phpBB/includes/ucp/ucp_pm_compose.php +++ b/phpBB/includes/ucp/ucp_pm_compose.php @@ -259,6 +259,25 @@ function compose_pm($id, $mode, $action) { trigger_error('NOT_AUTHORISED'); } + + // Passworded forum? + if ($post['forum_id']) + { + $sql = 'SELECT forum_password + FROM ' . FORUMS_TABLE . ' + WHERE forum_id = ' . (int) $post['forum_id']; + $result = $db->sql_query($sql); + $forum_password = (string) $db->sql_fetchfield('forum_password'); + $db->sql_freeresult($result); + + if ($forum_password) + { + login_forum_box(array( + 'forum_id' => $post['forum_id'], + 'forum_password' => $forum_password, + )); + } + } } $msg_id = (int) $post['msg_id']; |