aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/mcp
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2008-06-05 14:11:42 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2008-06-05 14:11:42 +0000
commit8822747b91883b0b9ddf322ce052ccb11f4429d5 (patch)
tree50a33184cf10fc0b8ae241bf68c8658ca675844f /phpBB/includes/mcp
parentea3eb9e9c3c2144fbb50cc2d78412fe8a854058f (diff)
downloadforums-8822747b91883b0b9ddf322ce052ccb11f4429d5.tar
forums-8822747b91883b0b9ddf322ce052ccb11f4429d5.tar.gz
forums-8822747b91883b0b9ddf322ce052ccb11f4429d5.tar.bz2
forums-8822747b91883b0b9ddf322ce052ccb11f4429d5.tar.xz
forums-8822747b91883b0b9ddf322ce052ccb11f4429d5.zip
merge...
git-svn-id: file:///svn/phpbb/trunk@8610 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/mcp')
-rw-r--r--phpBB/includes/mcp/mcp_ban.php2
-rw-r--r--phpBB/includes/mcp/mcp_queue.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/mcp/mcp_ban.php b/phpBB/includes/mcp/mcp_ban.php
index f63b1a4237..30d015fa0a 100644
--- a/phpBB/includes/mcp/mcp_ban.php
+++ b/phpBB/includes/mcp/mcp_ban.php
@@ -158,7 +158,7 @@ class mcp_ban
// As a "service" we will check if any post id is specified and populate the username of the poster id if given
$post_id = request_var('p', 0);
$user_id = request_var('u', 0);
- $username = false;
+ $username = $pre_fill = false;
if ($user_id && $user_id <> ANONYMOUS)
{
diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php
index eea00e5660..d1537df0e0 100644
--- a/phpBB/includes/mcp/mcp_queue.php
+++ b/phpBB/includes/mcp/mcp_queue.php
@@ -74,7 +74,7 @@ class mcp_queue
$this->tpl_name = 'mcp_post';
- $user->add_lang('posting');
+ $user->add_lang(array('posting', 'viewtopic'));
$post_id = request_var('p', 0);
$topic_id = request_var('t', 0);