Merge pull request #3528 from Hypolite/task/replace-explicit-php-logical-operators

[friendica.git] / mod / display.php

diff --git a/mod/display.php b/mod/display.php
index 365b657615b699acae192f3bf62ae823408cb1d6..a9816b06cea4f582da32327406da37bc2352ce21 100644 (file)
--- a/mod/display.php
+++ b/mod/display.php
@@ -71,7 +71,7 @@ function display_init(App $a) {
                                        WHERE `item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated`
                                                AND `id` = %d", $r[0]["parent"]);
                        }
-                       if (($itemuid != local_user()) AND local_user()) {
+                       if (($itemuid != local_user()) && local_user()) {
                                // Do we know this contact but we haven't got this item?
                                // Copy the wohle thread to our local storage so that we can interact.
                                // We really should change this need for the future since it scales very bad.
@@ -141,11 +141,11 @@ function display_fetchauthor($a, $item) {
 
        // Skip if it isn't a pure repeated messages
        // Does it start with a share?
-       if (!$skip AND strpos($body, "[share") > 0) {
+       if (!$skip && strpos($body, "[share") > 0) {
                $skip = true;
        }
        // Does it end with a share?
-       if (!$skip AND (strlen($body) > (strrpos($body, "[/share]") + 8))) {
+       if (!$skip && (strlen($body) > (strrpos($body, "[/share]") + 8))) {
                $skip = true;
        }
        if (!$skip) {
@@ -274,7 +274,7 @@ function display_content(App $a, $update = 0) {
                }
        }
 
-       if ($item_id AND !is_numeric($item_id)) {
+       if ($item_id && !is_numeric($item_id)) {
                $r = qu("SELECT `id` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
                        dbesc($item_id), intval($a->profile['uid']));
                if (dbm::is_result($r)) {