aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module/Embedphotos.php
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2018-02-24 08:42:25 +0100
committerMario Vavti <mario@mariovavti.com>2018-02-24 08:42:25 +0100
commitf6d024cb3f2663cd1d61e5fc18546adb93b9a7db (patch)
treed4067d517bfa67c20e9bae0a41d3a882f419735d /Zotlabs/Module/Embedphotos.php
parent1c750dac4187c3872e29c79f0c0856ec8a29331e (diff)
parente6f9f284bf04f0dc0471fa08d7dac118effe4ccb (diff)
downloadvolse-hubzilla-f6d024cb3f2663cd1d61e5fc18546adb93b9a7db.tar.gz
volse-hubzilla-f6d024cb3f2663cd1d61e5fc18546adb93b9a7db.tar.bz2
volse-hubzilla-f6d024cb3f2663cd1d61e5fc18546adb93b9a7db.zip
Merge remote-tracking branch 'mike/master' into dev
Diffstat (limited to 'Zotlabs/Module/Embedphotos.php')
-rw-r--r--Zotlabs/Module/Embedphotos.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/Zotlabs/Module/Embedphotos.php b/Zotlabs/Module/Embedphotos.php
index 15cc68d7f..bcbb0e116 100644
--- a/Zotlabs/Module/Embedphotos.php
+++ b/Zotlabs/Module/Embedphotos.php
@@ -53,7 +53,7 @@ class Embedphotos extends \Zotlabs\Web\Controller {
} else {
json_return_and_die(array('errormsg' => 'Error retrieving resource ' . $resource_id, 'status' => false));
}
- json_return_and_die(array('status' => true, 'photolink' => $photolink));
+ json_return_and_die(array('status' => true, 'photolink' => $photolink, 'resource_id' => $resource_id));
}
}