Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-09-19 16:25:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #14437 from annando/network-blank

Browse source 
Avoid blank network page on database issues
This commit is contained in:
Tobias Diekershoff 2024-09-15 09:03:07 +02:00 committed by GitHub
commit 38ff423716
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Module/Conversation/Network.php
View file

@ -222,7 +222,9 @@ class Network extends Timeline
$o .= $this->conversation->render($items, Conversation::MODE_NETWORK, false, false, $this->getOrder(), $this->session->getLocalUserId()); $o .= $this->conversation->render($items, Conversation::MODE_NETWORK, false, false, $this->getOrder(), $this->session->getLocalUserId());
} catch (\Exception $e) { } catch (\Exception $e) {
$this->logger->error('Exception when fetching items', ['code' => $e->getCode(), 'message' => $e->getMessage()]);
$o .= $this->l10n->t('Error %d (%s) while fetching the timeline.', $e->getCode(), $e->getMessage()); $o .= $this->l10n->t('Error %d (%s) while fetching the timeline.', $e->getCode(), $e->getMessage());
$items = [];
} }
if ($this->pConfig->get($this->session->getLocalUserId(), 'system', 'infinite_scroll')) { if ($this->pConfig->get($this->session->getLocalUserId(), 'system', 'infinite_scroll')) {

17
src/Module/Update/Network.php
View file

@ -27,12 +27,17 @@ class Network extends NetworkModule
System::htmlUpdateExit($o); System::htmlUpdateExit($o);
} }
if ($this->channel->isTimeline($this->selectedTab) || $this->userDefinedChannel->isTimeline($this->selectedTab, $this->session->getLocalUserId())) { try {
$items = $this->getChannelItems($request, $this->session->getLocalUserId()); if ($this->channel->isTimeline($this->selectedTab) || $this->userDefinedChannel->isTimeline($this->selectedTab, $this->session->getLocalUserId())) {
} elseif ($this->community->isTimeline($this->selectedTab)) { $items = $this->getChannelItems($request, $this->session->getLocalUserId());
$items = $this->getCommunityItems(); } elseif ($this->community->isTimeline($this->selectedTab)) {
} else { $items = $this->getCommunityItems();
$items = $this->getItems(); } else {
$items = $this->getItems();
}
} catch (\Exception $e) {
$this->logger->error('Exception when fetching items', ['code' => $e->getCode(), 'message' => $e->getMessage()]);
$items = [];
} }
$o = $this->conversation->render($items, Conversation::MODE_NETWORK, true, false, $this->getOrder(), $this->session->getLocalUserId()); $o = $this->conversation->render($items, Conversation::MODE_NETWORK, true, false, $this->getOrder(), $this->session->getLocalUserId());