diff options
| author | Andrew Manning <tamanning@zoho.com> | 2016-08-13 14:38:13 -0400 |
|---|---|---|
| committer | Andrew Manning <tamanning@zoho.com> | 2016-08-13 14:38:13 -0400 |
| commit | 125713e9385a485b9b9615c0f016e99954c9cfcf (patch) | |
| tree | f26107134c47b048a2b6cab813aface0a02052c6 /Zotlabs/Module/Embedphotos.php | |
| parent | e128ff4e8fa8da9ef7d0225c4e92b28d02155a12 (diff) | |
| download | volse-hubzilla-125713e9385a485b9b9615c0f016e99954c9cfcf.tar.gz volse-hubzilla-125713e9385a485b9b9615c0f016e99954c9cfcf.tar.bz2 volse-hubzilla-125713e9385a485b9b9615c0f016e99954c9cfcf.zip | |
Fix for older photos not being embedded by the embedphotos tool.
Diffstat (limited to 'Zotlabs/Module/Embedphotos.php')
| -rw-r--r-- | Zotlabs/Module/Embedphotos.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Zotlabs/Module/Embedphotos.php b/Zotlabs/Module/Embedphotos.php index 000caad60..0dc745b0a 100644 --- a/Zotlabs/Module/Embedphotos.php +++ b/Zotlabs/Module/Embedphotos.php @@ -39,7 +39,7 @@ class Embedphotos extends \Zotlabs\Web\Controller { json_return_and_die(array('errormsg' => 'Error retrieving link ' . $href, 'status' => false)); } $resource_id = array_pop(explode("/", $href)); - $r = q("SELECT obj from item where resource_type = 'photo' and resource_id = '%s' limit 1", + $r = q("SELECT obj,body from item where resource_type = 'photo' and resource_id = '%s' limit 1", dbesc($resource_id) ); if(!$r) { @@ -50,7 +50,9 @@ class Embedphotos extends \Zotlabs\Web\Controller { $photolink = $obj['body']; } elseif (x($obj,'bbcode')) { $photolink = $obj['bbcode']; - } else { + } elseif ($r[0]['body'] !== '') { + $photolink = $r[0]['body']; + } else { json_return_and_die(array('errormsg' => 'Error retrieving resource ' . $resource_id, 'status' => false)); } json_return_and_die(array('status' => true, 'photolink' => $photolink)); |