From ec92f7a81cf8fdfa453756e47ee17f4c4b7c9e58 Mon Sep 17 00:00:00 2001 From: Michael Date: Wed, 16 Nov 2022 04:57:46 +0000 Subject: [PATCH] Fix memory issue on displaying conversations --- src/Content/Conversation.php | 2 +- src/Module/Admin/Summary.php | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Content/Conversation.php b/src/Content/Conversation.php index ec317824b..da9aee87b 100644 --- a/src/Content/Conversation.php +++ b/src/Content/Conversation.php @@ -970,7 +970,7 @@ class Conversation } $condition = DBA::mergeConditions($condition, - ["`uid` IN (0, ?) AND (`vid` != ? OR `vid` IS NULL)", $uid, Verb::getID(Activity::FOLLOW)]); + ["`uid` IN (0, ?) AND (NOT `vid` IN (?, ?) OR `vid` IS NULL)", $uid, Verb::getID(Activity::FOLLOW), Verb::getID(Activity::VIEW)]); $thread_parents = Post::select(['uri-id', 'causer-id'], $condition, ['order' => ['uri-id' => false, 'uid']]); diff --git a/src/Module/Admin/Summary.php b/src/Module/Admin/Summary.php index 46d1ee9ad..d27a9b011 100644 --- a/src/Module/Admin/Summary.php +++ b/src/Module/Admin/Summary.php @@ -200,6 +200,8 @@ class Summary extends BaseAdmin $server_settings = [ 'label' => DI::l10n()->t('Server Settings'), 'php' => [ + 'version' => phpversion(), + 'php.ini' => php_ini_loaded_file(), 'upload_max_filesize' => ini_get('upload_max_filesize'), 'post_max_size' => ini_get('post_max_size'), 'memory_limit' => ini_get('memory_limit')