aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2004-05-26 18:22:06 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2004-05-26 18:22:06 +0000
commite81b720ca07e34005c3600a5bd56e42521925d95 (patch)
tree05083a9d0e23ac509a5be2ea83a15575c8adbac3
parent6c69aaaf43462d97bac704b5581340d7086edee7 (diff)
downloadforums-e81b720ca07e34005c3600a5bd56e42521925d95.tar
forums-e81b720ca07e34005c3600a5bd56e42521925d95.tar.gz
forums-e81b720ca07e34005c3600a5bd56e42521925d95.tar.bz2
forums-e81b720ca07e34005c3600a5bd56e42521925d95.tar.xz
forums-e81b720ca07e34005c3600a5bd56e42521925d95.zip
blabla
git-svn-id: file:///svn/phpbb/trunk@4891 89ea8834-ac86-4346-8a33-228a782c2dd0
-rwxr-xr-xphpBB/ucp.php10
1 files changed, 7 insertions, 3 deletions
diff --git a/phpBB/ucp.php b/phpBB/ucp.php
index 74d5956905..80d383e837 100755
--- a/phpBB/ucp.php
+++ b/phpBB/ucp.php
@@ -36,7 +36,6 @@ $phpEx = substr(strrchr(__FILE__, '.'), 1);
include($phpbb_root_path . 'common.'.$phpEx);
include($phpbb_root_path . '/includes/functions_user.'.$phpEx);
-
// ---------
// FUNCTIONS
//
@@ -168,6 +167,11 @@ class module
if ($run)
{
+ if (!isset($this->mode))
+ {
+ $this->mode = $mode;
+ }
+
eval("\$this->module = new {$this->type}_{$this->name}(\$this->id, \$this->mode);");
if (method_exists($this->module, 'init'))
{
@@ -249,7 +253,7 @@ switch ($mode)
break;
case 'register':
- if ($user->data['user_id'] != ANONYMOUS)
+ if ($user->data['user_id'] != ANONYMOUS || isset($_REQUEST['not_agreed']))
{
redirect("index.$phpEx$SID");
}
@@ -327,7 +331,7 @@ while ($row = $db->sql_fetchrow($result))
$db->sql_freeresult($result);
// Output PM_TO box if message composing
-if ($mode == 'compose' && $_REQUEST['action'] != 'edit')
+if ($mode == 'compose' && request_var('action', '') != 'edit')
{
if ($config['allow_mass_pm'])
{