From 0dd32d390726b091b88974debd53496a95b86616 Mon Sep 17 00:00:00 2001
From: Alec Smecher <alec@smecher.bc.ca>
Date: Mon, 30 Aug 2010 17:46:49 -0700
Subject: [PATCH] *5843* Fixed supp file upload bug

---
 pages/author/SubmitHandler.inc.php                | 8 ++++----
 pages/trackDirector/SubmissionEditHandler.inc.php | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pages/author/SubmitHandler.inc.php b/pages/author/SubmitHandler.inc.php
index 38c27e43a..945de7132 100644
--- a/pages/author/SubmitHandler.inc.php
+++ b/pages/author/SubmitHandler.inc.php
@@ -163,7 +163,7 @@ function saveSubmit($args) {
 
 				case 4:
 					if (Request::getUserVar('submitUploadSuppFile')) {
-						if ($suppFileId = SubmitHandler::submitUploadSuppFile()) {
+						if ($suppFileId = SubmitHandler::submitUploadSuppFile(array(), $request)) {
 							Request::redirect(null, null, null, 'submitSuppFile', $suppFileId, array('paperId' => $paperId));
 						} else {
 							$submitForm->addError('uploadSubmissionFile', Locale::translate('common.uploadFailed'));
@@ -230,8 +230,8 @@ function saveSubmit($args) {
 	/**
 	 * Create new supplementary file with a uploaded file.
 	 */
-	function submitUploadSuppFile() {
-		$paperId = Request::getUserVar('paperId');
+	function submitUploadSuppFile($args, $request) {
+		$paperId = $request->getUserVar('paperId');
 		$this->validate($paperId, 4);
 		$paper =& $this->paper;
 		$this->setupTemplate(true);
@@ -245,7 +245,7 @@ function submitUploadSuppFile() {
 
 		import('classes.author.form.submit.AuthorSubmitSuppFileForm');
 		$submitForm = new AuthorSubmitSuppFileForm($paper);
-		$submitForm->setData('title', Locale::translate('common.untitled'));
+		$submitForm->setData('title', array($paper->getLocale() => Locale::translate('common.untitled')));
 		return $submitForm->execute();
 	}
 
diff --git a/pages/trackDirector/SubmissionEditHandler.inc.php b/pages/trackDirector/SubmissionEditHandler.inc.php
index e4fe9136d..9d2a0da71 100644
--- a/pages/trackDirector/SubmissionEditHandler.inc.php
+++ b/pages/trackDirector/SubmissionEditHandler.inc.php
@@ -1486,7 +1486,7 @@ function uploadSuppFile($fileName = null, $round = null) {
 		import('classes.submission.form.SuppFileForm');
 
 		$suppFileForm = new SuppFileForm($submission);
-		$suppFileForm->setData('title', Locale::translate('common.untitled'));
+		$suppFileForm->setData('title', array($submission->getLocale() => Locale::translate('common.untitled')));
 		$suppFileId = $suppFileForm->execute($fileName);
 
 		Request::redirect(null, null, null, 'editSuppFile', array($paperId, $suppFileId));