From 0624cc69ede33c407d7602e4176e5514d08cad81 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Mon, 12 Apr 2010 08:47:46 +0000
Subject: [PATCH] MINOR Moved defined variables in AssetAdmin::doUpload() to
 the top of the method for consistency (from r96230)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@102468 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/AssetAdmin.php | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/code/AssetAdmin.php b/code/AssetAdmin.php
index 532eaef3..40b6a11c 100755
--- a/code/AssetAdmin.php
+++ b/code/AssetAdmin.php
@@ -147,6 +147,13 @@ JS
 	 */
 	function doUpload($data, $form) {
 		$processedFiles = array();
+		$newFiles = array();
+		$fileIDs = array();
+		$fileNames = array();
+		$fileSizeWarnings = '';
+		$errorsArr = '';
+		$status = '';
+		$statusMessage = '';
 		
 		if(!isset($data['Files'])) return Director::set_status_code("404");
 		
@@ -157,25 +164,17 @@ JS
 					$processedFiles[$key][$param] = $value;
 				}
 			}
-		}
-		else {
+		} else {
 			$proccessedFiles[] = $data['Files'];
 		}
 		
 		// get the folder to upload to.
 		if(isset($data['FolderID']) && $data['FolderID'] != "root") {
 			$folder = DataObject::get_by_id('Folder', $data['FolderID']);
-		}
-		else {
+		} else {
 			$folder = DataObject::get_one('Folder');
 		}
 		
-		$newFiles = array();
-		$fileSizeWarnings = '';
-		$errorsArr = '';
-		$status = '';
-		$statusMessage = '';
-
 		foreach($processedFiles as $tmpFile) {
 			if($tmpFile['error'] == UPLOAD_ERR_NO_TMP_DIR) {
 				$errorsArr[] = _t('AssetAdmin.NOTEMP', 'There is no temporary folder for uploads. Please set upload_tmp_dir in php.ini.');
@@ -210,7 +209,7 @@ JS
 
 		if($newFiles) {
 			$numFiles = sizeof($newFiles);
-			$statusMessage = sprintf(_t('AssetAdmin.UPLOADEDX',"Uploaded %s files"),$numFiles) ;
+			$statusMessage = sprintf(_t('AssetAdmin.UPLOADEDX',"Uploaded %s files"),$numFiles);
 			$status = "good";
 		} else if($errorsArr) {
 			$statusMessage = implode('\n', $errorsArr);
@@ -220,8 +219,6 @@ JS
 			$status = "";
 		}
 
-		$fileIDs = array();
-		$fileNames = array();
 		foreach($newFiles as $newFile) {
 			$fileIDs[] = $newFile;
 			$fileObj = DataObject::get_one('File', "\"File\".\"ID\"=$newFile");