Fix attaching files when submititng issues via web

mantisbt · Mar 4, 2018 · 567fc79 · 567fc79
1 parent 1ae16f1
commit 567fc79
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/bug_report.php b/bug_report.php
@@ -84,7 +84,7 @@
 
 $f_files = gpc_get_file( 'ufile', null );
 if( $f_files !== null && !empty( $f_files ) ) {
-	$t_issue['attachments'] = helper_array_transpose( $f_files );
+	$t_issue['files'] = helper_array_transpose( $f_files );
 }
 
 $t_build = gpc_get_string( 'build', '' );

diff --git a/core/commands/IssueAddCommand.php b/core/commands/IssueAddCommand.php
@@ -289,7 +289,7 @@ function validate() {
 		mci_project_custom_fields_validate( $t_project_id, $t_issue['custom_fields'] );
 
 		if( isset( $t_issue['files'] ) && !empty( $t_issue['files'] ) ) {
-			if( !file_allow_bug_upload( $t_issue_id ) ) {
+			if( !file_allow_bug_upload( /* issue id */ null, /* user id */ null, $t_project_id ) ) {
 				throw new ClientException(
 					'User not allowed to attach files.',
 					ERROR_ACCESS_DENIED );

diff --git a/core/file_api.php b/core/file_api.php
@@ -911,9 +911,10 @@ function file_allow_project_upload( $p_project_id = null, $p_user_id = null ) {
  * upload a file to a new bug in the current project
  * @param integer $p_bug_id  A bug identifier.
  * @param integer $p_user_id A user identifier.
+ * @param integer $p_project_id The project id to check for or null for bug project or current project.
  * @return boolean
  */
-function file_allow_bug_upload( $p_bug_id = null, $p_user_id = null ) {
+function file_allow_bug_upload( $p_bug_id = null, $p_user_id = null, $p_project_id = null ) {
 	if( null === $p_user_id ) {
 		$p_user_id = auth_get_current_user_id();
 	}
@@ -925,7 +926,7 @@ function file_allow_bug_upload( $p_bug_id = null, $p_user_id = null ) {
 
 	if( null === $p_bug_id ) {
 		# new bug
-		$t_project_id = helper_get_current_project();
+		$t_project_id = $p_project_id === null ? helper_get_current_project() : $p_project_id;
 
 		# the user must be the reporter if they're reporting a new bug
 		$t_reporter = true;