New field "publish" for channels

diff --git a/src/Content/Conversation/Repository/UserDefinedChannel.php b/src/Content/Conversation/Repository/UserDefinedChannel.php
index d78d1cc1a08197b9e6b803924d9ff3eee351ad35..5b8317b8656405f18fa2746e0ac33df2e263518f 100644 (file)
--- a/src/Content/Conversation/Repository/UserDefinedChannel.php
+++ b/src/Content/Conversation/Repository/UserDefinedChannel.php
@@ -354,4 +354,15 @@ class UserDefinedChannel extends BaseRepository
                }
                return $condition;
        }
+
+       private function getUserCondition()
+       {
+               $condition = ["`verified` AND NOT `blocked` AND NOT `account_removed` AND NOT `account_expired` AND `user`.`uid` > ?", 0];
+
+               $abandon_days = intval($this->config->get('system', 'account_abandon_days'));
+               if (!empty($abandon_days)) {
+                       $condition = DBA::mergeConditions($condition, ["`last-activity` > ?", DateTimeFormat::utc('now - ' . $abandon_days . ' days')]);
+               }
+               return $condition;
+       }
 }

diff --git a/src/Model/Item.php b/src/Model/Item.php
index c17d7d4b0200487d7f632bb00ef794158470f719..9c76b59fcaac08e2b266780b372473fde5857f0b 100644 (file)
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -1934,6 +1934,7 @@ class Item
                        }
                }
 
+               $result = self::compactLanguages($result);
                if (empty($result)) {
                        return ['un' => 1];
                }