aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2008-09-18 15:05:51 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2008-09-18 15:05:51 +0000
commitb91b43d22ce5baa6cdc552cd343dc2bfdce134ff (patch)
tree0ed0d718c41025890e380afe6d4b003dfa50302a
parentc246231f053569ff28caf3ab3b4e2b162b2b516f (diff)
downloadforums-b91b43d22ce5baa6cdc552cd343dc2bfdce134ff.tar
forums-b91b43d22ce5baa6cdc552cd343dc2bfdce134ff.tar.gz
forums-b91b43d22ce5baa6cdc552cd343dc2bfdce134ff.tar.bz2
forums-b91b43d22ce5baa6cdc552cd343dc2bfdce134ff.tar.xz
forums-b91b43d22ce5baa6cdc552cd343dc2bfdce134ff.zip
remove duplicate statement
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8883 89ea8834-ac86-4346-8a33-228a782c2dd0
-rw-r--r--phpBB/includes/ucp/ucp_pm_compose.php2
-rw-r--r--phpBB/posting.php2
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 14caa57c89..c69c5da6cd 100644
--- a/phpBB/includes/ucp/ucp_pm_compose.php
+++ b/phpBB/includes/ucp/ucp_pm_compose.php
@@ -932,7 +932,7 @@ function compose_pm($id, $mode, $action)
$s_hidden_fields .= (isset($check_value)) ? '<input type="hidden" name="status_switch" value="' . $check_value . '" />' : '';
$s_hidden_fields .= ($draft_id || isset($_REQUEST['draft_loaded'])) ? '<input type="hidden" name="draft_loaded" value="' . ((isset($_REQUEST['draft_loaded'])) ? intval($_REQUEST['draft_loaded']) : $draft_id) . '" />' : '';
- $form_enctype = (@ini_get('file_uploads') == '0' || strtolower(@ini_get('file_uploads')) == 'off' || @ini_get('file_uploads') == '0' || !$config['allow_pm_attach'] || !$auth->acl_get('u_pm_attach')) ? '' : ' enctype="multipart/form-data"';
+ $form_enctype = (@ini_get('file_uploads') == '0' || strtolower(@ini_get('file_uploads')) == 'off' || !$config['allow_pm_attach'] || !$auth->acl_get('u_pm_attach')) ? '' : ' enctype="multipart/form-data"';
// Start assigning vars for main posting page ...
$template->assign_vars(array(
diff --git a/phpBB/posting.php b/phpBB/posting.php
index 64e26766b3..dbad69cf52 100644
--- a/phpBB/posting.php
+++ b/phpBB/posting.php
@@ -1264,7 +1264,7 @@ if ($solved_captcha !== false)
);
}
-$form_enctype = (@ini_get('file_uploads') == '0' || strtolower(@ini_get('file_uploads')) == 'off' || @ini_get('file_uploads') == '0' || !$config['allow_attachments'] || !$auth->acl_get('u_attach') || !$auth->acl_get('f_attach', $forum_id)) ? '' : ' enctype="multipart/form-data"';
+$form_enctype = (@ini_get('file_uploads') == '0' || strtolower(@ini_get('file_uploads')) == 'off' || !$config['allow_attachments'] || !$auth->acl_get('u_attach') || !$auth->acl_get('f_attach', $forum_id)) ? '' : ' enctype="multipart/form-data"';
add_form_key('posting');