diff options
author | Andreas Fischer <bantu@phpbb.com> | 2010-07-08 03:06:41 +0200 |
---|---|---|
committer | Andreas Fischer <bantu@phpbb.com> | 2010-07-08 03:06:41 +0200 |
commit | 31b221ae913c49fa2e2a776bd9fd54659728fcd0 (patch) | |
tree | 01cf1ee53c1203df718f1ef4916dec670d32a3ff /phpBB/includes/acp/acp_forums.php | |
parent | dea1d660fb63b07451f1a43310de359251462644 (diff) | |
parent | c79df9700df8fb238ae386e890dd97316bb97fc6 (diff) | |
download | forums-31b221ae913c49fa2e2a776bd9fd54659728fcd0.tar forums-31b221ae913c49fa2e2a776bd9fd54659728fcd0.tar.gz forums-31b221ae913c49fa2e2a776bd9fd54659728fcd0.tar.bz2 forums-31b221ae913c49fa2e2a776bd9fd54659728fcd0.tar.xz forums-31b221ae913c49fa2e2a776bd9fd54659728fcd0.zip |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/9712] Future dates can be formatted as 'less than one minute ago'
[ticket/9659] Signature options in set_user_options
[ticket/9703] Correct database leak where deleting user did not rm some PM data
[ticket/9697] Backlink broken when the select parent forum does not exist.
[ticket/9695] Correct the improper display of user input in mcp_ban.php
[ticket/9628] _add_module 'after'-parameter does not work correctly.
[ticket/9578] ACP Posting tab is missing "Post settings" module.
Diffstat (limited to 'phpBB/includes/acp/acp_forums.php')
-rw-r--r-- | phpBB/includes/acp/acp_forums.php | 2 |
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 . '&' . $this->parent_id), E_USER_WARNING); + trigger_error($user->lang['PARENT_NOT_EXIST'] . adm_back_link($this->u_action . '&parent_id=' . $this->parent_id), E_USER_WARNING); } if ($row['forum_type'] == FORUM_LINK) |