X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=object%2FItem.php;h=45d2dba3edb78c81c68823eecb1d08e312b4b8c0;hb=125d2f24dd8a9946a4b57bbda000bf15f6b0a60c;hp=e6d6bd45f542b46ae1ad4b4535aa1e0d2416a22a;hpb=e512a83ecc003a5f63329193ce25bde2d96d1e6d;p=friendica.git diff --git a/object/Item.php b/object/Item.php index e6d6bd45f5..45d2dba3ed 100644 --- a/object/Item.php +++ b/object/Item.php @@ -89,14 +89,14 @@ class Item extends BaseObject { $a = $this->get_app(); $item = $this->get_data(); - $edited = false; - if (strcmp($item['created'], $item['edited'])<>0) { - $edited = array( - 'label' => t('This entry was edited'), - 'date' => datetime_convert('UTC', date_default_timezone_get(), $item['edited'], 'r'), - 'relative' => relative_date($item['edited']) - ); - } + $edited = false; + if (strcmp($item['created'], $item['edited'])<>0) { + $edited = array( + 'label' => t('This entry was edited'), + 'date' => datetime_convert('UTC', date_default_timezone_get(), $item['edited'], 'r'), + 'relative' => relative_date($item['edited']) + ); + } $commentww = ''; $sparkle = ''; $buttons = ''; @@ -150,7 +150,7 @@ class Item extends BaseObject { else $profile_link = zrl($profile_link); - if (!isset($item['author-thumb'])) { + if (!isset($item['author-thumb']) OR ($item['author-thumb'] == "")) { $author_contact = get_contact_details_by_url($item['author-link'], $conv->get_profile_owner()); if ($author_contact["thumb"]) $item['author-thumb'] = $author_contact["thumb"]; @@ -158,7 +158,7 @@ class Item extends BaseObject { $item['author-thumb'] = $item['author-avatar']; } - if (!isset($item['owner-thumb'])) { + if (!isset($item['owner-thumb']) OR ($item['owner-thumb'] == "")) { $owner_contact = get_contact_details_by_url($item['owner-link'], $conv->get_profile_owner()); if ($owner_contact["thumb"]) $item['owner-thumb'] = $owner_contact["thumb"]; @@ -235,7 +235,7 @@ class Item extends BaseObject { intval($item['uid']), intval($item['id']) ); - if (count($r)) { + if (dbm::is_result($r)) { $ignore = array( 'do' => t("ignore thread"), 'undo' => t("unignore thread"), @@ -439,10 +439,10 @@ class Item extends BaseObject { } } - if ($this->is_toplevel()) { - $result['total_comments_num'] = "$total_children"; - $result['total_comments_text'] = tt('comment', 'comments', $total_children); - } + if ($this->is_toplevel()) { + $result['total_comments_num'] = "$total_children"; + $result['total_comments_text'] = tt('comment', 'comments', $total_children); + } $result['private'] = $item['private']; $result['toplevel'] = ($this->is_toplevel() ? 'toplevel_item' : '');