diff options
| author | Nils Adermann <naderman@naderman.de> | 2010-05-16 16:49:39 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2010-05-16 16:49:39 +0200 |
| commit | e477b3acc8d3de159da9dd1dd185c46a9f16c13a (patch) | |
| tree | 1d2426fac05a95c58855051c91fe980212835a6f | |
| parent | 478708346e2b046ae474ffb0c2e451a2690ddd2b (diff) | |
| parent | e3ba934cd7b0325a5fdc444aace0e13d8c84fc59 (diff) | |
| download | forums-e477b3acc8d3de159da9dd1dd185c46a9f16c13a.tar forums-e477b3acc8d3de159da9dd1dd185c46a9f16c13a.tar.gz forums-e477b3acc8d3de159da9dd1dd185c46a9f16c13a.tar.bz2 forums-e477b3acc8d3de159da9dd1dd185c46a9f16c13a.tar.xz forums-e477b3acc8d3de159da9dd1dd185c46a9f16c13a.zip | |
Merge branch 'ticket/nickvergessen/8894' into develop-olympus
* ticket/nickvergessen/8894:
[ticket/8894] Fix JavaScript-Error and hide Quote-Button on topic review if BBCodes are not allowed.
| -rw-r--r-- | phpBB/includes/ucp/ucp_pm_compose.php | 2 | ||||
| -rw-r--r-- | phpBB/posting.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/ucp/ucp_pm_compose.php b/phpBB/includes/ucp/ucp_pm_compose.php index 4d72d45f81..b596e72c41 100644 --- a/phpBB/includes/ucp/ucp_pm_compose.php +++ b/phpBB/includes/ucp/ucp_pm_compose.php @@ -1054,7 +1054,7 @@ function compose_pm($id, $mode, $action) 'S_COMPOSE_PM' => true, 'S_EDIT_POST' => ($action == 'edit'), 'S_SHOW_PM_ICONS' => $s_pm_icons, - 'S_BBCODE_ALLOWED' => $bbcode_status, + 'S_BBCODE_ALLOWED' => ($bbcode_status) ? 1 : 0, 'S_BBCODE_CHECKED' => ($bbcode_checked) ? ' checked="checked"' : '', 'S_SMILIES_ALLOWED' => $smilies_status, 'S_SMILIES_CHECKED' => ($smilies_checked) ? ' checked="checked"' : '', diff --git a/phpBB/posting.php b/phpBB/posting.php index 5f27b61aae..1f593df561 100644 --- a/phpBB/posting.php +++ b/phpBB/posting.php @@ -1420,7 +1420,7 @@ $template->assign_vars(array( 'S_DISPLAY_USERNAME' => (!$user->data['is_registered'] || ($mode == 'edit' && $post_data['poster_id'] == ANONYMOUS)) ? true : false, 'S_SHOW_TOPIC_ICONS' => $s_topic_icons, 'S_DELETE_ALLOWED' => ($mode == 'edit' && (($post_id == $post_data['topic_last_post_id'] && $post_data['poster_id'] == $user->data['user_id'] && $auth->acl_get('f_delete', $forum_id) && !$post_data['post_edit_locked'] && ($post_data['post_time'] > time() - ($config['delete_time'] * 60) || !$config['delete_time'])) || $auth->acl_get('m_delete', $forum_id))) ? true : false, - 'S_BBCODE_ALLOWED' => $bbcode_status, + 'S_BBCODE_ALLOWED' => ($bbcode_status) ? 1 : 0, 'S_BBCODE_CHECKED' => ($bbcode_checked) ? ' checked="checked"' : '', 'S_SMILIES_ALLOWED' => $smilies_status, 'S_SMILIES_CHECKED' => ($smilies_checked) ? ' checked="checked"' : '', |