aboutsummaryrefslogtreecommitdiffstats
path: root/include/text.php
diff options
context:
space:
mode:
authorAndrew Manning <tamanning@zoho.com>2016-06-04 05:45:53 -0400
committerAndrew Manning <tamanning@zoho.com>2016-06-04 05:45:53 -0400
commitc08f428b5e7979e87250c2b0a30cd16344b395d9 (patch)
tree4da053975141628a0ead27f5a50606e9aec4fc27 /include/text.php
parentb93e398674b375a3b14718fc6dd2a815aad9b387 (diff)
parent20a79c7acf1850f431f4fd52972ea0b6acf8ce0c (diff)
downloadvolse-hubzilla-c08f428b5e7979e87250c2b0a30cd16344b395d9.tar.gz
volse-hubzilla-c08f428b5e7979e87250c2b0a30cd16344b395d9.tar.bz2
volse-hubzilla-c08f428b5e7979e87250c2b0a30cd16344b395d9.zip
Merge remote-tracking branch 'upstream/dev' into wiki
Diffstat (limited to 'include/text.php')
-rw-r--r--include/text.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/text.php b/include/text.php
index 834eec920..72db9c5ea 100644
--- a/include/text.php
+++ b/include/text.php
@@ -1473,7 +1473,7 @@ function prepare_body(&$item,$attach = false) {
if($is_photo) {
- $object = json_decode($item['object'],true);
+ $object = json_decode($item['obj'],true);
// if original photo width is <= 640px prepend it to item body
if($object['link'][0]['width'] && $object['link'][0]['width'] <= 640) {