closes #6272

diff --git a/doc/api.md b/doc/api.md
index 2715f44462ea2392e7cc20ddde78362df97ac74d..0f2243b5c1bb316315c3787f34c74fde53f49dfd 100644 (file)
--- a/doc/api.md
+++ b/doc/api.md
@@ -379,6 +379,18 @@ Friendica doesn't allow showing the friends of other users.
 
 * media: image data
 
+#### Return values
+
+Object of:
+
+* media_id: a media identifier (integer)
+* media_id_string: a media identifier (string)
+* size: size in byte
+* image.w: image width
+* image.h: image height
+* image.image_type: image mime type
+* image.friendica_preview_url: image preview url
+
 ---
 
 ### oauth/request_token (*)

diff --git a/include/api.php b/include/api.php
index 8a89d00d773cd7ebc354bc5d2c1f44c30e9b4484..1fca7966709372ea63be03e624cb909bb67fdd2f 100644 (file)
--- a/include/api.php
+++ b/include/api.php
@@ -945,7 +945,6 @@ function api_format_data($root_element, $type, $data)
                        $ret = $data;
                        break;
        }
-
        return $ret;
 }
 
@@ -1244,7 +1243,7 @@ function api_media_upload()
        $returndata["image"] = ["w" => $media["width"],
                                "h" => $media["height"],
                                "image_type" => $media["type"],
-                               "preview" => $media["preview"]];
+                               "friendica_preview_url" => $media["preview"]];
 
        Logger::log("Media uploaded: " . print_r($returndata, true), Logger::DEBUG);
 
@@ -5685,7 +5684,6 @@ function api_friendica_notification($type)
 
                $notes = $xmlnotes;
        }
-
        return api_format_data("notes", $type, ['note' => $notes]);
 }
 

diff --git a/tests/include/ApiTest.php b/tests/include/ApiTest.php
index e4e654f464c23bd9685fed0828bf3ea84ec15a14..270f66aa5393f399d45a427928891f62c2955a3a 100644 (file)
--- a/tests/include/ApiTest.php
+++ b/tests/include/ApiTest.php
@@ -1249,6 +1249,7 @@ class ApiTest extends DatabaseTest
                $this->assertEquals('image/png', $result['media']['image']['image_type']);
                $this->assertEquals(1, $result['media']['image']['w']);
                $this->assertEquals(1, $result['media']['image']['h']);
+               $this->assertNotEmpty($result['media']['image']['friendica_preview_url']);
        }
 
        /**