aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2010-07-08 01:29:47 +0200
committerAndreas Fischer <bantu@phpbb.com>2010-07-08 01:29:47 +0200
commitc091a04a558708ee2ba888b18adc1b5a24c014dd (patch)
treed6f85577a7b19f2ca543ddee1d3eaf6630909c5c
parente3fe4d7b56cd251f3abeb5690406d30de8b1dc0e (diff)
parent0db657381b4e20c0fd1ccb8c4c8e6a52b55b127d (diff)
downloadforums-c091a04a558708ee2ba888b18adc1b5a24c014dd.tar
forums-c091a04a558708ee2ba888b18adc1b5a24c014dd.tar.gz
forums-c091a04a558708ee2ba888b18adc1b5a24c014dd.tar.bz2
forums-c091a04a558708ee2ba888b18adc1b5a24c014dd.tar.xz
forums-c091a04a558708ee2ba888b18adc1b5a24c014dd.zip
Merge branch 'ticket/nickvergessen/9697' into develop-olympus
* ticket/nickvergessen/9697: [ticket/9697] Backlink broken when the select parent forum does not exist.
-rw-r--r--phpBB/includes/acp/acp_forums.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/acp/acp_forums.php b/phpBB/includes/acp/acp_forums.php
index 6261f866bb..f2f1bd80e2 100644
--- a/phpBB/includes/acp/acp_forums.php
+++ b/phpBB/includes/acp/acp_forums.php
@@ -983,7 +983,7 @@ class acp_forums
if (!$row)
{
- trigger_error($user->lang['PARENT_NOT_EXIST'] . adm_back_link($this->u_action . '&amp;' . $this->parent_id), E_USER_WARNING);
+ trigger_error($user->lang['PARENT_NOT_EXIST'] . adm_back_link($this->u_action . '&amp;parent_id=' . $this->parent_id), E_USER_WARNING);
}
if ($row['forum_type'] == FORUM_LINK)