Merge pull request #3598 from annando/1707-expiration

[friendica.git] / include / conversation.php

diff --git a/include/conversation.php b/include/conversation.php
index 6ce9a6dea427fb8ff6951907c8199f0acbb8b7b1..e58df19f16cc03908d0c71174fc569750b4530ff 100644 (file)
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -1,9 +1,10 @@
 <?php
 
+use Friendica\App;
+
 require_once "include/bbcode.php";
 require_once "include/acl_selectors.php";
 
-
 /*
  * Note: the code in 'item_extract_images' and 'item_redir_and_replace_images'
  * is identical to the code in mod/message.php for 'item_extract_images' and
@@ -711,7 +712,7 @@ function conversation(App $a, $items, $mode, $update, $preview = false) {
                                        $profile_link = zrl($profile_link);
                                }
 
-                               if (!x($item, 'author-thumb') OR ($item['author-thumb'] == "")) {
+                               if (!x($item, 'author-thumb') || ($item['author-thumb'] == "")) {
                                        $author_contact = get_contact_details_by_url($item['author-link'], $profile_owner);
                                        if ($author_contact["thumb"]) {
                                                $item['author-thumb'] = $author_contact["thumb"];
@@ -720,7 +721,7 @@ function conversation(App $a, $items, $mode, $update, $preview = false) {
                                        }
                                }
 
-                               if (!isset($item['owner-thumb']) OR ($item['owner-thumb'] == "")) {
+                               if (!isset($item['owner-thumb']) || ($item['owner-thumb'] == "")) {
                                        $owner_contact = get_contact_details_by_url($item['owner-link'], $profile_owner);
                                        if ($owner_contact["thumb"]) {
                                                $item['owner-thumb'] = $owner_contact["thumb"];
@@ -1012,7 +1013,7 @@ function item_photo_menu($item) {
                        $menu[t("Poke")] = $poke_link;
                }
 
-               if ((($cid == 0) OR ($rel == CONTACT_IS_FOLLOWER)) AND
+               if ((($cid == 0) || ($rel == CONTACT_IS_FOLLOWER)) &&
                        in_array($item['network'], array(NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_DIASPORA))) {
                        $menu[t('Connect/Follow')] = 'follow?url=' . urlencode($item['author-link']);
                }
@@ -1416,9 +1417,9 @@ function conv_sort($arr, $order) {
        }
 
        if (stristr($order, 'created')) {
-               usort($parents,'sort_thr_created');
+               usort($parents, 'sort_thr_created');
        } elseif (stristr($order, 'commented')) {
-               usort($parents,'sort_thr_commented');
+               usort($parents, 'sort_thr_commented');
        }
 
        if (count($parents)) {
@@ -1532,19 +1533,19 @@ function get_responses($conv_responses, $response_verbs, $ob, $item) {
 function get_response_button_text($v, $count) {
        switch ($v) {
                case 'like':
-                       return tt('Like','Likes', $count,'noun');
+                       return tt('Like', 'Likes', $count, 'noun');
                        break;
                case 'dislike':
-                       return tt('Dislike','Dislikes', $count,'noun');
+                       return tt('Dislike', 'Dislikes', $count, 'noun');
                        break;
                case 'attendyes':
-                       return tt('Attending','Attending', $count,'noun');
+                       return tt('Attending', 'Attending', $count, 'noun');
                        break;
                case 'attendno':
-                       return tt('Not Attending','Not Attending', $count,'noun');
+                       return tt('Not Attending', 'Not Attending', $count, 'noun');
                        break;
                case 'attendmaybe':
-                       return tt('Undecided','Undecided', $count,'noun');
+                       return tt('Undecided', 'Undecided', $count, 'noun');
                        break;
        }
 }