aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBart van Bragt <bartvb@users.sourceforge.net>2005-10-26 13:54:17 +0000
committerBart van Bragt <bartvb@users.sourceforge.net>2005-10-26 13:54:17 +0000
commit88b4c7ac8822e2fe287f3a02932011769e39d226 (patch)
tree7e65d99ccc058cc24b088ff4a8bcd725adf4b674
parenta052a9a8d412a8eca6977d222648327cbbbed680 (diff)
downloadforums-88b4c7ac8822e2fe287f3a02932011769e39d226.tar
forums-88b4c7ac8822e2fe287f3a02932011769e39d226.tar.gz
forums-88b4c7ac8822e2fe287f3a02932011769e39d226.tar.bz2
forums-88b4c7ac8822e2fe287f3a02932011769e39d226.tar.xz
forums-88b4c7ac8822e2fe287f3a02932011769e39d226.zip
Fix small problem with PM-ing replies to board messages
git-svn-id: file:///svn/phpbb/trunk@5281 89ea8834-ac86-4346-8a33-228a782c2dd0
-rw-r--r--phpBB/includes/ucp/ucp_pm_compose.php8
1 files changed, 7 insertions, 1 deletions
diff --git a/phpBB/includes/ucp/ucp_pm_compose.php b/phpBB/includes/ucp/ucp_pm_compose.php
index 6a349d9e91..ce8282bbbd 100644
--- a/phpBB/includes/ucp/ucp_pm_compose.php
+++ b/phpBB/includes/ucp/ucp_pm_compose.php
@@ -81,6 +81,12 @@ function compose_pm($id, $mode, $action)
case 'quote':
case 'forward':
case 'quotepost':
+ if ($submit)
+ {
+ // We don't need to retrieve the post text again when the user is submitting.
+ break;
+ }
+
if (!$msg_id)
{
trigger_error('NO_MESSAGE');
@@ -581,7 +587,7 @@ function compose_pm($id, $mode, $action)
if ($action == 'quotepost')
{
$post_id = request_var('p', 0);
- $message_link = "[url={$config['script_path']}viewtopic.$phpEx?p={$post_id}#{$post_id}]{$message_subject}[/url]\n";
+ $message_link = "[url=" . generate_board_url() . "/viewtopic.$phpEx?p={$post_id}#{$post_id}]{$message_subject}[/url]\n";
}
else
{