Merge remote-tracking branch 'upstream/develop' into 1702-no-language

[friendica.git] / mod / network.php

diff --git a/mod/network.php b/mod/network.php
index 2f33c62f72ecb19e205f217b86a51b99ebec8aa9..23cf098b65b25913ad3bc95bd0ec2f3ac6d3411d 100644 (file)
--- a/mod/network.php
+++ b/mod/network.php
@@ -574,9 +574,10 @@ function network_content(App $a, $update = 0) {
                        $sql_order = "`item`.`id`";
                        $order_mode = "id";
                } else {
-                       if (get_config('system','use_fulltext_engine'))
-                               $sql_extra = sprintf(" AND MATCH (`item`.`body`, `item`.`title`) AGAINST ('%s' in boolean mode) ", dbesc(protect_sprintf($search)));
-                       else
+                       // Disabled until final decision what to do with this
+                       //if (get_config('system','use_fulltext_engine'))
+                       //      $sql_extra = sprintf(" AND MATCH (`item`.`body`, `item`.`title`) AGAINST ('%s' in boolean mode) ", dbesc(protect_sprintf($search)));
+                       //else
                                $sql_extra = sprintf(" AND `item`.`body` REGEXP '%s' ", dbesc(protect_sprintf(preg_quote($search))));
                        $sql_order = "`item`.`id`";
                        $order_mode = "id";
@@ -762,24 +763,23 @@ function network_content(App $a, $update = 0) {
 // on they just get buried deeper. It has happened to me a couple of times also.
 
 
-       if((! $group) && (! $cid) && (! $star)) {
+       if (!$group && !$cid && !$star) {
 
-               $unseen = q("SELECT `id` FROM `item` WHERE `unseen` AND `uid` = %d",
+               $unseen = q("SELECT `id` FROM `item` WHERE `unseen` AND `uid` = %d LIMIT 1",
                                intval(local_user()));
 
-               if ($unseen)
+               if (dbm::is_result($unseen)) {
                        $r = q("UPDATE `item` SET `unseen` = 0
                                WHERE `unseen` = 1 AND `uid` = %d",
                                intval(local_user())
                        );
-       }
-       else {
-               if($update_unseen) {
+               }
+       } elseif ($update_unseen) {
 
-                       $unseen = q("SELECT `id` FROM `item` ".$update_unseen);
+               $unseen = q("SELECT `id` FROM `item` ".$update_unseen. " LIMIT 1");
 
-                       if ($unseen)
-                               $r = q("UPDATE `item` SET `unseen` = 0 $update_unseen");
+               if (dbm::is_result($unseen)) {
+                       $r = q("UPDATE `item` SET `unseen` = 0 $update_unseen");
                }
        }
 
@@ -790,10 +790,10 @@ function network_content(App $a, $update = 0) {
 
        $o .= conversation($a,$items,$mode,$update);
 
-       if(!$update) {
-               if(get_pconfig(local_user(),'system','infinite_scroll')) {
+       if (!$update) {
+               if (get_pconfig(local_user(),'system','infinite_scroll')) {
                        $o .= scroll_loader();
-               } elseif(!get_config('system', 'old_pager')) {
+               } elseif (!get_config('system', 'old_pager')) {
                        $o .= alt_pager($a,count($items));
                } else {
                        $o .= paginate($a);