diff options
Diffstat (limited to 'phpBB/includes/ucp/ucp_prefs.php')
| -rw-r--r-- | phpBB/includes/ucp/ucp_prefs.php | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/phpBB/includes/ucp/ucp_prefs.php b/phpBB/includes/ucp/ucp_prefs.php index 9ace08e1cb..1df28f80f8 100644 --- a/phpBB/includes/ucp/ucp_prefs.php +++ b/phpBB/includes/ucp/ucp_prefs.php @@ -156,7 +156,7 @@ class ucp_prefs extends ucp 'user_viewsmilies' => $data['smilies'], 'user_viewsigs' => $data['sigs'], 'user_viewavatars' => $data['avatars'], - 'user_viewcensors' => $data['wordcensor'], + 'user_viewcensors' => ($auth->acl_get('u_chgcensors')) ? $data['wordcensor'] : $user->data['user_viewcensors'], 'user_sortby_type' => $data['sk'], 'user_sortby_dir' => $data['sd'], 'user_show_days' => $data['st'], @@ -212,19 +212,20 @@ class ucp_prefs extends ucp $template->assign_vars(array( 'ERROR' => (sizeof($this->error)) ? implode('<br />', $this->error) : '', - 'VIEW_IMAGES_YES' => $images_yes, - 'VIEW_IMAGES_NO' => $images_no, - 'VIEW_FLASH_YES' => $flash_yes, - 'VIEW_FLASH_NO' => $flash_no, - 'VIEW_SMILIES_YES' => $smilies_yes, - 'VIEW_SMILIES_NO' => $smilies_no, - 'VIEW_SIGS_YES' => $sigs_yes, - 'VIEW_SIGS_NO' => $sigs_no, - 'VIEW_AVATARS_YES' => $avatars_yes, - 'VIEW_AVATARS_NO' => $avatars_no, - 'DISABLE_CENSORS_YES'=> $wordcensor_yes, - 'DISABLE_CENSORS_NO'=> $wordcensor_no, - + 'VIEW_IMAGES_YES' => $images_yes, + 'VIEW_IMAGES_NO' => $images_no, + 'VIEW_FLASH_YES' => $flash_yes, + 'VIEW_FLASH_NO' => $flash_no, + 'VIEW_SMILIES_YES' => $smilies_yes, + 'VIEW_SMILIES_NO' => $smilies_no, + 'VIEW_SIGS_YES' => $sigs_yes, + 'VIEW_SIGS_NO' => $sigs_no, + 'VIEW_AVATARS_YES' => $avatars_yes, + 'VIEW_AVATARS_NO' => $avatars_no, + 'DISABLE_CENSORS_YES' => $wordcensor_yes, + 'DISABLE_CENSORS_NO' => $wordcensor_no, + + 'S_CHANGE_CENSORS' => ($auth->acl_get('u_chgcensors')) ? true : false, 'S_SELECT_SORT_DAYS' => $s_limit_days, 'S_SELECT_SORT_KEY' => $s_sort_key, 'S_SELECT_SORT_DIR' => $s_sort_dir) |