Fix memory issue on displaying conversations

diff --git a/src/Content/Conversation.php b/src/Content/Conversation.php
index ec317824b67b72cad1780a6cf5e9c52286685c39..da9aee87b00aee1090954c904e1bda589abcdc4d 100644 (file)
--- 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 46d1ee9ad1a3f5387a7d85d6fe8a1ba35c941a64..d27a9b011ba6c008ccb5afa3e1fa62af0d0601a0 100644 (file)
--- 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')