clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #12190 from annando/no-view 

Fix memory issue on displaying conversations
This commit is contained in:
Philipp 2022-11-16 10:52:18 +01:00 committed by GitHub
parent 53f3454874 ec92f7a81c
commit 5204d79dee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Content/Conversation.php
View File

@ -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']]);

2
src/Module/Admin/Summary.php
View File

@ -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')