From ff84e0f73c7a3e9b81ec25b1f0666dc9901e8317 Mon Sep 17 00:00:00 2001
From: secretr <m.yovchev@gmail.com>
Date: Tue, 11 May 2010 10:35:55 +0000
Subject: [PATCH] Upload shortcode return type fix, minor UI problem

---
 e107_core/shortcodes/single/uploadfile.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/e107_core/shortcodes/single/uploadfile.php b/e107_core/shortcodes/single/uploadfile.php
index 925bd3115..73928d7a6 100644
--- a/e107_core/shortcodes/single/uploadfile.php
+++ b/e107_core/shortcodes/single/uploadfile.php
@@ -130,7 +130,7 @@ function uploadfile_shortcode($parm)
 			{
 				$emessage->addStack($finfo['message'], 'upload_shortcode', $finfo['error'] ? E_MESSAGE_ERROR : E_MESSAGE_SUCCESS);
 			}
-			return($parms['return_type'] == 'message' ? $emessage->render('upload_shortcode') : '');
+			if($parms['return_type'] == 'message') return $emessage->render('upload_shortcode');
 		}
 		return($parms['return_type'] == 'result' ? $uploaded : '');
 	}
@@ -151,8 +151,8 @@ function uploadfile_shortcode($parm)
 					<div id='{$parms['up_row']}' class='nowrap'>
 						<input class='tbox file' type='file' name='{$name}' />
 			        </div>
-			        <div class='field-help'>Upload to: <strong>".str_replace('../', '', $path)."</strong></div>
 				</div>
+				<div class='field-help'>Upload to: <strong>".str_replace('../', '', $path)."</strong></div>
 			</div>
 			<!-- End Upload Shortcode -->
 		";