diff options
Diffstat (limited to 'Zotlabs/Widget')
| -rw-r--r-- | Zotlabs/Widget/Album.php | 3 | ||||
| -rw-r--r-- | Zotlabs/Widget/Messages.php | 6 | ||||
| -rw-r--r-- | Zotlabs/Widget/Notifications.php | 8 | ||||
| -rw-r--r-- | Zotlabs/Widget/Pinned.php | 4 | ||||
| -rw-r--r-- | Zotlabs/Widget/Portfolio.php | 4 |
5 files changed, 17 insertions, 8 deletions
diff --git a/Zotlabs/Widget/Album.php b/Zotlabs/Widget/Album.php index f1fa69182..667952360 100644 --- a/Zotlabs/Widget/Album.php +++ b/Zotlabs/Widget/Album.php @@ -59,6 +59,9 @@ class Album { //edit album name $album_edit = null; + $ph = photo_factory(''); + $phototypes = $ph->supportedTypes(); + $photos = array(); if($r) { $twist = 'rotright'; diff --git a/Zotlabs/Widget/Messages.php b/Zotlabs/Widget/Messages.php index 761679120..cc1811ffc 100644 --- a/Zotlabs/Widget/Messages.php +++ b/Zotlabs/Widget/Messages.php @@ -86,8 +86,6 @@ class Messages { $entries = []; $limit = 30; $order_sql = 'i.created DESC'; - $dummy_order_sql = ''; - $filter_sql = ''; $loadtime = (($offset) ? $_SESSION['messages_loadtime'] : datetime_convert()); $vnotify = get_pconfig(local_channel(), 'system', 'vnotify', -1); @@ -103,14 +101,18 @@ class Messages { $vnotify_sql_i = " AND i.verb NOT IN ('Dislike', '" . dbesc(ACTIVITY_DISLIKE) . "') "; } + $filter_sql = ''; if($type !== 'filed' && $author) { $filter_sql = " AND (i.owner_xchan = '" . protect_sprintf(dbesc($author)) . "') "; } + $filed_filter_sql = ''; if($type === 'filed' && $file) { $filed_filter_sql = " AND (term.term = '" . protect_sprintf(dbesc($file)) . "') "; } + $dummy_order_sql = ''; + switch($type) { case 'direct': $type_sql = ' AND i.item_private = 2 AND i.item_thread_top = 1 '; diff --git a/Zotlabs/Widget/Notifications.php b/Zotlabs/Widget/Notifications.php index fb256ec99..f9cee6e71 100644 --- a/Zotlabs/Widget/Notifications.php +++ b/Zotlabs/Widget/Notifications.php @@ -30,7 +30,7 @@ class Notifications { 'label' => t('Mark all read') ], 'filter' => [ - 'posts_label' => t('Conversation starters only'), + 'posts_label' => t('Conversation starters'), 'name_label' => t('Filter by name or address') ] ]; @@ -50,7 +50,7 @@ class Notifications { 'label' => t('Mark all seen') ], 'filter' => [ - 'posts_label' => t('Conversation starters only'), + 'posts_label' => t('Conversation starters'), 'name_label' => t('Filter by name or address') ] ]; @@ -69,7 +69,7 @@ class Notifications { 'label' => t('Mark all read') ], 'filter' => [ - 'posts_label' => t('Conversation starters only'), + 'posts_label' => t('Conversation starters'), 'name_label' => t('Filter by name or address') ] ]; @@ -163,7 +163,7 @@ class Notifications { ], */ 'filter' => [ - 'posts_label' => t('Conversation starters only'), + 'posts_label' => t('Conversation starters'), 'name_label' => t('Filter by name or address') ] ]; diff --git a/Zotlabs/Widget/Pinned.php b/Zotlabs/Widget/Pinned.php index 9daf396b8..7b95d3bc6 100644 --- a/Zotlabs/Widget/Pinned.php +++ b/Zotlabs/Widget/Pinned.php @@ -197,12 +197,12 @@ class Pinned { return []; - $r = q("SELECT parent FROM item WHERE uuid IN ( '%s' ) AND uid = %d AND id = parent AND item_private = 0", + $r = q("SELECT parent AS item_id FROM item WHERE uuid IN ( '%s' ) AND uid = %d AND id = parent AND item_private = 0", dbesc(implode(",", $mids_list)), intval($this->uid) ); - return items_by_parent_ids($r[0]['parent'], blog_mode: true); + return items_by_parent_ids($r, blog_mode: true); } diff --git a/Zotlabs/Widget/Portfolio.php b/Zotlabs/Widget/Portfolio.php index bde1c7d6a..1c9dc162a 100644 --- a/Zotlabs/Widget/Portfolio.php +++ b/Zotlabs/Widget/Portfolio.php @@ -66,6 +66,10 @@ class Portfolio { //edit album name $album_edit = null; + + $ph = photo_factory(''); + $phototypes = $ph->supportedTypes(); + $photos = array(); if($r) { $twist = 'rotright'; |