aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/ucp.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2007-04-29 12:30:22 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2007-04-29 12:30:22 +0000
commit290187c6c79d069ea669384c515ba38965ff1002 (patch)
treeb19f7a3ee1413b8405cbf9e3ce221a19080491ea /phpBB/ucp.php
parentc262c4addbb8d18fdd3a84d0a4b64dd9899320c0 (diff)
downloadforums-290187c6c79d069ea669384c515ba38965ff1002.tar
forums-290187c6c79d069ea669384c515ba38965ff1002.tar.gz
forums-290187c6c79d069ea669384c515ba38965ff1002.tar.bz2
forums-290187c6c79d069ea669384c515ba38965ff1002.tar.xz
forums-290187c6c79d069ea669384c515ba38965ff1002.zip
more bugfixing. Important change: admins able to give ban reason for user quick tool ban - logging also syndicated, now always logged to ACP and MCP logs.
git-svn-id: file:///svn/phpbb/trunk@7426 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/ucp.php')
-rwxr-xr-xphpBB/ucp.php6
1 files changed, 6 insertions, 0 deletions
diff --git a/phpBB/ucp.php b/phpBB/ucp.php
index 6812cd59b9..2d47134538 100755
--- a/phpBB/ucp.php
+++ b/phpBB/ucp.php
@@ -292,6 +292,12 @@ if ($module->is_active('zebra', 'friends'))
$db->sql_freeresult($result);
}
+// Do not display subscribed topics/forums if not allowed
+if (!$config['allow_topic_notify'] && !$config['allow_forum_notify'])
+{
+ $module->set_display('main', 'subscribed', false);
+}
+
// Select the active module
$module->set_active($id, $mode);