2 files changed, 9 insertions, 22 deletions
diff --git a/mod/file/views/default/file/embed_upload.php b/mod/file/views/default/file/embed_upload.php
index 65308cb63..a5cf7ee59 100644
--- a/mod/file/views/default/file/embed_upload.php
+++ b/mod/file/views/default/file/embed_upload.php
@@ -3,26 +3,7 @@
  * Files upload form for embed
  */
 
-$access_id = get_default_access(elgg_get_logged_in_user_entity());
-if ($categories = elgg_view('categories', $vars)) {
-	$categories = "<p>$categories</p>";
-}
-
-// recycling the upload action so some of these options are a bit weird.
-$form_body = '<p>' . elgg_view('input/file', array('internalname' => 'upload')) . '</p>';
-$form_body .= '<p>' . elgg_echo('file:title') . ": " . elgg_view("input/text", array('internalname' => 'title')) . '</p>';
-$form_body .= '<p>' . elgg_echo('file:desc') . ": " . elgg_view("input/text",array('internalname' => 'description')) . '</p>';
-$form_body .= '<p>' . elgg_echo('file:tags') . ": " . elgg_view("input/tags", array('internalname' => 'tags')) . '</p>';
-$form_body .= '<p>' . elgg_echo('access') . ": " . elgg_view('input/access', array('internalname' => 'access_id', 'value' => $access_id)) . '</p>';
-$form_body .= $categories;
-$form_body .= elgg_view('input/hidden', array('internalname' => 'ajax', 'value' => TRUE));
-$form_body .= '<p>' . elgg_view('input/submit', array('value' => elgg_echo('upload'))) . '</p>';
-
-echo elgg_view('input/form', array(
-	'body' => $form_body,
-	'internalid' => 'file_embed_upload',
-	'action' => 'action/file/upload',
-));
+echo elgg_view_form('file/upload', array('internalid' => 'file_embed_upload'), array('ajax' => TRUE));
 
 ?>
 
diff --git a/mod/file/views/default/forms/file/upload.php b/mod/file/views/default/forms/file/upload.php
index f3012ea7a..2ab1ce3e5 100644
--- a/mod/file/views/default/forms/file/upload.php
+++ b/mod/file/views/default/forms/file/upload.php
@@ -12,6 +12,7 @@ $tags = elgg_get_array_value('tags', $vars, '');
 $access_id = elgg_get_array_value('access_id', $vars, ACCESS_DEFAULT);
 $container_guid = elgg_get_array_value('container_guid', $vars);
 $guid = elgg_get_array_value('guid', $vars, null);
+$ajax = elgg_get_array_value('ajax', $vars, FALSE);
 
 if ($guid) {
 	$file_label = elgg_echo("file:replace");
@@ -38,7 +39,7 @@ if ($guid) {
 </p>
 <?php
 
-$categories = elgg_view('categories', $vars);
+$categories = elgg_view('input/categories', $vars);
 if ($categories) {
 	echo "<p>$categories</p>";
 }
@@ -52,7 +53,12 @@ if ($categories) {
 <?php
 
 echo elgg_view('input/hidden', array('internalname' => 'container_guid', 'value' => $container_guid));
-	
+
+//@todo this should not be necessary in 1.8... -- ajax actions can be auto-detected
+if ($ajax) {
+	echo elgg_view('input/hidden', array('internalname' => 'ajax', 'value' => 1));
+}
+
 if ($guid) {
 	echo elgg_view('input/hidden', array('internalname' => 'file_guid', 'value' => $guid));
 }