aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions_posting.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2006-02-22 21:42:26 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2006-02-22 21:42:26 +0000
commit6b13f94be9fdd4054e08d593f5c871a11853344e (patch)
treea9394609b17fc472f2b9748d6e16130d18df22aa /phpBB/includes/functions_posting.php
parent19d5dddaebecd2ef85eee40690a69f272fafdb2d (diff)
downloadforums-6b13f94be9fdd4054e08d593f5c871a11853344e.tar
forums-6b13f94be9fdd4054e08d593f5c871a11853344e.tar.gz
forums-6b13f94be9fdd4054e08d593f5c871a11853344e.tar.bz2
forums-6b13f94be9fdd4054e08d593f5c871a11853344e.tar.xz
forums-6b13f94be9fdd4054e08d593f5c871a11853344e.zip
implementing permission roles
- copy permissions (adding groups) - copy permissions (adding forums) - checking proper groupadd/del settings - added intro page to permissions (to give an overview and quick links) - able to select forums + subforums, single forum, all groups, all users (permission screens) - able to reset permissions (only reset input field) - fix forum deletion bug git-svn-id: file:///svn/phpbb/trunk@5574 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_posting.php')
-rw-r--r--phpBB/includes/functions_posting.php10
1 files changed, 5 insertions, 5 deletions
diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index 40f17a33e9..3670d118c5 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -938,7 +938,7 @@ function user_notification($mode, $subject, $topic_title, $forum_name, $forum_id
$db->sql_freeresult($result);
// forum notification is sent to those not receiving post notification
- if ($topic_notification)
+ if ($forum_notification)
{
if (sizeof($notify_rows))
{
@@ -1037,10 +1037,10 @@ function user_notification($mode, $subject, $topic_title, $forum_name, $forum_id
$messenger->assign_vars(array(
'EMAIL_SIG' => $email_sig,
- 'SITENAME' => $config['sitename'],
- 'USERNAME' => $addr['name'],
- 'TOPIC_TITLE' => $topic_title,
- 'FORUM_NAME' => $forum_name,
+ 'SITENAME' => html_entity_decode($config['sitename']),
+ 'USERNAME' => html_entity_decode($addr['name']),
+ 'TOPIC_TITLE' => html_entity_decode($topic_title),
+ 'FORUM_NAME' => html_entity_decode($forum_name),
'U_FORUM' => generate_board_url() . "/viewforum.$phpEx?f=$forum_id&e=0",
'U_TOPIC' => generate_board_url() . "/viewtopic.$phpEx?f=$forum_id&t=$topic_id&e=0",