aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/mcp.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2008-09-30 15:18:35 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2008-09-30 15:18:35 +0000
commitad4d7c036eb144559bbce553afa4952587c28e56 (patch)
tree4a24c7861d50bc475f27220b3eb317bf09e836dd /phpBB/mcp.php
parente4c3a743cae78196ef0e2bfd0dcd27e1ea4bb1ba (diff)
downloadforums-ad4d7c036eb144559bbce553afa4952587c28e56.tar
forums-ad4d7c036eb144559bbce553afa4952587c28e56.tar.gz
forums-ad4d7c036eb144559bbce553afa4952587c28e56.tar.bz2
forums-ad4d7c036eb144559bbce553afa4952587c28e56.tar.xz
forums-ad4d7c036eb144559bbce553afa4952587c28e56.zip
merge r8956, r8957 and r8960
git-svn-id: file:///svn/phpbb/trunk@8961 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/mcp.php')
-rw-r--r--phpBB/mcp.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/phpBB/mcp.php b/phpBB/mcp.php
index 7e2d4feb7c..2632ec21e5 100644
--- a/phpBB/mcp.php
+++ b/phpBB/mcp.php
@@ -166,7 +166,7 @@ if ($quickmod)
case 'delete_post':
case 'delete_topic':
$module->load('mcp', 'main', 'quickmod');
- exit;
+ return;
break;
case 'topic_logs':
@@ -183,7 +183,8 @@ if ($quickmod)
break;
default:
- trigger_error("$action not allowed as quickmod");
+ trigger_error("$action not allowed as quickmod", E_USER_ERROR);
+ break;
}
}
else