merged 2 if() into one as requested by CR

[friendica.git] / include / queue_fn.php

diff --git a/include/queue_fn.php b/include/queue_fn.php
index 8840668112300dbb4d96d62ebd63e7047e15a815..9dcefdd244b59288c9177a401735d186480a680b 100644 (file)
--- a/include/queue_fn.php
+++ b/include/queue_fn.php
@@ -49,24 +49,23 @@ function was_recently_delayed($cid) {
 function add_to_queue($cid,$network,$msg,$batch = false) {
 
        $max_queue = get_config('system','max_contact_queue');
-       if ($max_queue < 1) {
+       if($max_queue < 1)
                $max_queue = 500;
-       }
 
        $batch_queue = get_config('system','max_batch_queue');
-       if ($batch_queue < 1) {
+       if($batch_queue < 1)
                $batch_queue = 1000;
-       }
 
        $r = q("SELECT COUNT(*) AS `total` FROM `queue` INNER JOIN `contact` ON `queue`.`cid` = `contact`.`id` 
                WHERE `queue`.`cid` = %d AND `contact`.`self` = 0 ",
                intval($cid)
        );
        if (dbm::is_result($r)) {
-               if ($batch &&  ($r[0]['total'] > $batch_queue)) {
+               if($batch &&  ($r[0]['total'] > $batch_queue)) {
                        logger('add_to_queue: too many queued items for batch server ' . $cid . ' - discarding message');
                        return;
-               } elseif ((! $batch) && ($r[0]['total'] > $max_queue)) {
+               }
+               elseif((! $batch) && ($r[0]['total'] > $max_queue)) {
                        logger('add_to_queue: too many queued items for contact ' . $cid . ' - discarding message');
                        return;
                }