From 125731cab092a724c52b60621a6ff42a5d0d8fdb Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind1991@gmail.com>
Date: Tue, 10 Jan 2012 16:47:52 +0100
Subject: [PATCH] fix uploading to subfolders

---
 files/templates/index.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/files/templates/index.php b/files/templates/index.php
index fd1158a029..9ebfa41cef 100644
--- a/files/templates/index.php
+++ b/files/templates/index.php
@@ -1,4 +1,3 @@
-<input type="hidden" name="dir" value="<?php echo $_['dir'] ?>" id="dir">
 <div id="controls">
 	<?php echo($_['breadcrumb']); ?>
 	<?php if (!isset($_['readonly']) || !$_['readonly']):?>
@@ -17,6 +16,7 @@
 				<form data-upload-id='1' class="file_upload_form" action="ajax/upload.php" method="post" enctype="multipart/form-data" target="file_upload_target_1">
 					<input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $_['uploadMaxFilesize'] ?>" id="max_upload">
 					<input type="hidden" class="max_human_file_size" value="(max <?php echo $_['uploadMaxHumanFilesize']; ?>)">
+					<input type="hidden" name="dir" value="<?php echo $_['dir'] ?>" id="dir">
 					<button class="file_upload_filename"><img class='svg action' alt="Upload" src="<?php echo image_path("core", "actions/upload.svg"); ?>" /></button>
 					<input class="file_upload_start" type="file" name='files[]'/>
 						<a href="#" class="file_upload_button_wrapper" onclick="return false;" title="<?php echo $l->t('Upload'); echo  ' max. '.$_['uploadMaxHumanFilesize'] ?>"></a>
@@ -25,6 +25,8 @@
 			</div>
 		</div>
 		<div id="file_action_panel"></div>
+	<?php else:?>
+		<input type="hidden" name="dir" value="<?php echo $_['dir'] ?>" id="dir">
 	<?php endif;?>
 </div>
 <div id='notification'></div>