aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2003-10-12 09:09:58 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2003-10-12 09:09:58 +0000
commit32683fda12560c778a0d622d36e575db27cbb75a (patch)
tree4f0f03d08b4f02b260e3fa48eac65afbd222012b /phpBB/includes/functions.php
parentc5b5dd033aa1ff5833fd29cd8286f3251afe371e (diff)
downloadforums-32683fda12560c778a0d622d36e575db27cbb75a.tar
forums-32683fda12560c778a0d622d36e575db27cbb75a.tar.gz
forums-32683fda12560c778a0d622d36e575db27cbb75a.tar.bz2
forums-32683fda12560c778a0d622d36e575db27cbb75a.tar.xz
forums-32683fda12560c778a0d622d36e575db27cbb75a.zip
new rule
git-svn-id: file:///svn/phpbb/trunk@4571 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions.php')
-rw-r--r--phpBB/includes/functions.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 9078e5063a..9a39a38b63 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -256,7 +256,7 @@ function gen_forum_rules($mode, &$forum_id)
{
global $SID, $template, $auth, $user;
- $rules = array('post', 'reply', 'edit', 'delete', 'attach', 'download');
+ $rules = array('post', 'reply', 'lock', 'edit', 'delete', 'attach', 'download');
foreach ($rules as $rule)
{
@@ -818,7 +818,7 @@ function obtain_word_list(&$censors)
{
global $db, $cache, $user;
- if (!$user->data['user_viewcensors'] && !$user->data['coppa'] && $config['allow_nocensors'])
+ if (!$user->optionget('viewcensors') && !$user->data['coppa'] && $config['allow_nocensors'])
{
return;
}
@@ -1423,7 +1423,7 @@ function page_header($page_title = '')
'U_SEARCH_UNANSWERED' => 'search.'.$phpEx.$SID.'&amp;search_id=unanswered',
'S_USER_LOGGED_IN' => ($user->data['user_id'] != ANONYMOUS) ? true : false,
- 'S_USER_PM_POPUP' => (!empty($user->data['user_popup_pm'])) ? true : false,
+ 'S_USER_PM_POPUP' => ($user->optionget('popuppm')) ? true : false,
'S_USER_BROWSER' => $user->data['session_browser'],
'S_CONTENT_DIRECTION' => $user->lang['DIRECTION'],
'S_CONTENT_ENCODING' => $user->lang['ENCODING'],