aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/api.php5
-rw-r--r--mod/wall_attach.php1
-rw-r--r--version.inc2
3 files changed, 5 insertions, 3 deletions
diff --git a/include/api.php b/include/api.php
index c2687f3e4..e4b28bc54 100644
--- a/include/api.php
+++ b/include/api.php
@@ -667,6 +667,7 @@ require_once('include/items.php');
$a->argv[1] = $user_info['screen_name'];
$_REQUEST['silent']='1'; //tell wall_upload function to return img info instead of echo
+ $_FILES['userfile'] = $_FILES['media'];
require_once('mod/wall_attach.php');
$posted = wall_attach_post($a);
@@ -755,8 +756,8 @@ require_once('include/items.php');
$_FILES['userfile'] = $_FILES['media'];
// upload the image if we have one
$_REQUEST['silent']='1'; //tell wall_upload function to return img info instead of echo
- require_once('mod/wall_upload.php');
- $media = wall_upload_post($a);
+ require_once('mod/wall_attach.php');
+ $media = wall_attach_post($a);
if(strlen($media)>0)
$_REQUEST['body'] .= "\n\n".$media;
}
diff --git a/mod/wall_attach.php b/mod/wall_attach.php
index 498389986..021f9f999 100644
--- a/mod/wall_attach.php
+++ b/mod/wall_attach.php
@@ -23,6 +23,7 @@ function wall_attach_post(&$a) {
if($_FILES['userfile']['tmp_name']) {
$x = @getimagesize($_FILES['userfile']['tmp_name']);
+ logger('getimagesize: ' . print_r($x,true), LOGGER_DATA);
if(($x) && ($x[2] === IMG_GIF || $x[2] === IMG_JPG || $x[2] === IMG_JPEG || $x[2] === IMG_PNG)) {
$args = array( 'source' => 'editor', 'visible' => 0, 'contact_allow' => array($channel['channel_hash']));
$ret = photo_upload($channel,$observer,$args);
diff --git a/version.inc b/version.inc
index 28a313996..13f97a89c 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2015-04-17.1005
+2015-04-18.1006