aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-08-15 19:21:22 -0700
committerfriendica <info@friendica.com>2013-08-15 19:21:22 -0700
commitd0951777c0c13e9e554595f91d01f78424b1b45a (patch)
tree96592921618a119868ec9f937581e31751d4c4a6
parent764e0201ce8259c84a3b6ce643a52effe9dc8a59 (diff)
downloadvolse-hubzilla-d0951777c0c13e9e554595f91d01f78424b1b45a.tar.gz
volse-hubzilla-d0951777c0c13e9e554595f91d01f78424b1b45a.tar.bz2
volse-hubzilla-d0951777c0c13e9e554595f91d01f78424b1b45a.zip
fix import from file
-rw-r--r--mod/import.php8
-rwxr-xr-xview/tpl/channel_import.tpl2
2 files changed, 5 insertions, 5 deletions
diff --git a/mod/import.php b/mod/import.php
index 4c878f5c6..c98f4d2eb 100644
--- a/mod/import.php
+++ b/mod/import.php
@@ -16,10 +16,10 @@ function import_post(&$a) {
$data = null;
$seize = ((x($_REQUEST,'make_primary')) ? intval($_REQUEST['make_primary']) : 0);
- $src = $_FILES['userfile']['tmp_name'];
- $filename = basename($_FILES['userfile']['name']);
- $filesize = intval($_FILES['userfile']['size']);
- $filetype = $_FILES['userfile']['type'];
+ $src = $_FILES['filename']['tmp_name'];
+ $filename = basename($_FILES['filename']['name']);
+ $filesize = intval($_FILES['filename']['size']);
+ $filetype = $_FILES['filename']['type'];
if($src) {
diff --git a/view/tpl/channel_import.tpl b/view/tpl/channel_import.tpl
index 4804e34d6..f7635ea52 100755
--- a/view/tpl/channel_import.tpl
+++ b/view/tpl/channel_import.tpl
@@ -1,6 +1,6 @@
<h2>{{$title}}</h2>
-<form action="import" method="post" id="import-channel-form">
+<form action="import" method="post" enctype="multipart/form-data" id="import-channel-form">
<div id="import-desc" class="descriptive-paragraph">{{$desc}}</div>