diff options
| author | Andrew Manning <tamanning@zoho.com> | 2016-08-13 14:20:41 -0400 |
|---|---|---|
| committer | Andrew Manning <tamanning@zoho.com> | 2016-08-13 14:20:41 -0400 |
| commit | e128ff4e8fa8da9ef7d0225c4e92b28d02155a12 (patch) | |
| tree | f0302bf5cd846e783a5f1316c4c432d0fbd9d8d7 /Zotlabs | |
| parent | 2c8a82713e828ae79374099c8de90dd584f9f4d1 (diff) | |
| download | volse-hubzilla-e128ff4e8fa8da9ef7d0225c4e92b28d02155a12.tar.gz volse-hubzilla-e128ff4e8fa8da9ef7d0225c4e92b28d02155a12.tar.bz2 volse-hubzilla-e128ff4e8fa8da9ef7d0225c4e92b28d02155a12.zip | |
Fixed bug preventing images in root photo album from loading in embedphotos dialog.
Diffstat (limited to 'Zotlabs')
| -rw-r--r-- | Zotlabs/Module/Embedphotos.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Zotlabs/Module/Embedphotos.php b/Zotlabs/Module/Embedphotos.php index 0dac873c5..000caad60 100644 --- a/Zotlabs/Module/Embedphotos.php +++ b/Zotlabs/Module/Embedphotos.php @@ -40,8 +40,8 @@ class Embedphotos extends \Zotlabs\Web\Controller { } $resource_id = array_pop(explode("/", $href)); $r = q("SELECT obj from item where resource_type = 'photo' and resource_id = '%s' limit 1", - dbesc($resource_id) - ); + dbesc($resource_id) + ); if(!$r) { json_return_and_die(array('errormsg' => 'Error retrieving resource ' . $resource_id, 'status' => false)); } @@ -83,7 +83,7 @@ function embedphotos_widget_album($args) { return ''; if($args['album']) - $album = $args['album']; + $album = (($args['album'] === '/') ? '' : $args['album'] ); if($args['title']) $title = $args['title']; |