Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-11-18 21:43:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #8177 from nupplaphil/bug/intro_bug

Browse source 
Fix Introductions tab
This commit is contained in:
Tobias Diekershoff 2020-01-26 22:22:24 +01:00 committed by GitHub
commit 723d843d20
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/Factory/Notification/Introduction.php
View file

@ -15,7 +15,7 @@ use Friendica\Database\Database;
use Friendica\Model\Contact; use Friendica\Model\Contact;
use Friendica\Module\BaseNotifications; use Friendica\Module\BaseNotifications;
use Friendica\Network\HTTPException\InternalServerErrorException; use Friendica\Network\HTTPException\InternalServerErrorException;
use Friendica\Object; use Friendica\Object\Notification;
use Friendica\Util\Proxy; use Friendica\Util\Proxy;
use Psr\Log\LoggerInterface; use Psr\Log\LoggerInterface;
@ -61,7 +61,7 @@ class Introduction extends BaseFactory
* @param int $limit Maximum number of query results * @param int $limit Maximum number of query results
* @param int $id When set, only the introduction with this id is displayed * @param int $id When set, only the introduction with this id is displayed
* *
* @return Object\Notification\Introduction[] * @return Notification\Introduction[]
*/ */
public function getList(bool $all = false, int $start = 0, int $limit = BaseNotifications::DEFAULT_PAGE_LIMIT, int $id = 0) public function getList(bool $all = false, int $start = 0, int $limit = BaseNotifications::DEFAULT_PAGE_LIMIT, int $id = 0)
{ {
@ -108,7 +108,7 @@ class Introduction extends BaseFactory
$this->baseUrl->getHostName() . $this->baseUrl->getHostName() .
(($this->baseUrl->getURLPath()) ? '/' . $this->baseUrl->getURLPath() : '')); (($this->baseUrl->getURLPath()) ? '/' . $this->baseUrl->getURLPath() : ''));
$formattedNotifications[] = new Introduction([ $formattedNotifications[] = new Notification\Introduction([
'label' => 'friend_suggestion', 'label' => 'friend_suggestion',
'str_type' => $this->l10n->t('Friend Suggestion'), 'str_type' => $this->l10n->t('Friend Suggestion'),
'intro_id' => $notification['intro_id'], 'intro_id' => $notification['intro_id'],
@ -141,7 +141,7 @@ class Introduction extends BaseFactory
$notification['ggender'] = ""; $notification['ggender'] = "";
} }
$formattedNotifications[] = new Introduction([ $formattedNotifications[] = new Notification\Introduction([
'label' => (($notification['network'] !== Protocol::OSTATUS) ? 'friend_request' : 'follower'), 'label' => (($notification['network'] !== Protocol::OSTATUS) ? 'friend_request' : 'follower'),
'str_type' => (($notification['network'] !== Protocol::OSTATUS) ? $this->l10n->t('Friend/Connect Request') : $this->l10n->t('New Follower')), 'str_type' => (($notification['network'] !== Protocol::OSTATUS) ? $this->l10n->t('Friend/Connect Request') : $this->l10n->t('New Follower')),
'dfrn_id' => $notification['issued-id'], 'dfrn_id' => $notification['issued-id'],