friendica
/
friendica-addons
mirror of https://git.friendi.ca/friendica/friendica-addons.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #1147 from annando/deprecated 

Widgets: Replaced deprecated function
pull/1149/head
Tobias Diekershoff 2021-07-24 10:37:08 +02:00 committed by GitHub
parent 4ff458ecf2 dfd710b59d
commit 42454b3cf7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
widgets/widget_friendheader.php
View File

@ -1,7 +1,9 @@
<?php <?php
use Friendica\Content\Text\HTML; use Friendica\Content\Text\HTML;
use Friendica\Content\Widget\ContactBlock;
use Friendica\DI; use Friendica\DI;
use Friendica\Model\User;
function friendheader_widget_name() function friendheader_widget_name()
{ {
@ -25,17 +27,11 @@ function friendheader_widget_size()
function friendheader_widget_content(&$a, $conf) function friendheader_widget_content(&$a, $conf)
{ {
$r = q("SELECT `profile`.* , `user`.* FROM `profile` $owner = User::getOwnerDataById($conf['uid']);
LEFT JOIN `user` ON `profile`.`uid` = `user`.`uid` if (empty($owner)) {
WHERE `user`.`uid` = %s LIMIT 1",
intval($conf['uid'])
);
if (!count($r)) {
return; return;
} }
$a->profile = $r[0];
$o = ""; $o = "";
$o .= "<style> $o .= "<style>
body {font-size: 0.8em; margin: 0px; padding: 0px;} body {font-size: 0.8em; margin: 0px; padding: 0px;}
@ -46,8 +42,8 @@ function friendheader_widget_content(&$a, $conf)
.contact-block-div { display: block !important; float: left!important; width: 50px!important; height: 50px!important; margin: 2px!important;} .contact-block-div { display: block !important; float: left!important; width: 50px!important; height: 50px!important; margin: 2px!important;}
</style>"; </style>";
$o .= _abs_url(HTML::contactBlock()); $o .= _abs_url(ContactBlock::getHTML($owner));
$o .= "<a href='".DI::baseUrl()->get().'/profile/'.$a->profile['nickname']."' target=new>". DI::l10n()->t('Get added to this list!') ."</a>"; $o .= "<a href='".DI::baseUrl()->get().'/profile/'.$owner['nickname']."' target=new>". DI::l10n()->t('Get added to this list!') ."</a>";
return $o; return $o;
} }

19
widgets/widget_friends.php
View File

@ -1,8 +1,8 @@
<?php <?php
use Friendica\Content\Text\HTML; use Friendica\Content\Widget\ContactBlock;
use Friendica\Core\L10n;
use Friendica\DI; use Friendica\DI;
use Friendica\Model\User;
function friends_widget_name() function friends_widget_name()
{ {
@ -27,18 +27,11 @@ function friends_widget_size()
function friends_widget_content(&$a, $conf) function friends_widget_content(&$a, $conf)
{ {
$r = q("SELECT `profile`.* , `user`.* FROM `profile` $owner = User::getOwnerDataById($conf['uid']);
LEFT JOIN `user` ON `profile`.`uid` = `user`.`uid` if (empty($owner)) {
WHERE `user`.`uid` = %s LIMIT 1",
intval($conf['uid'])
);
if (!count($r)) {
return; return;
} }
$a->profile = $r[0];
$o = ""; $o = "";
$o .= "<style> $o .= "<style>
body {font-size: 0.8em; margin: 0px; padding: 0px;} body {font-size: 0.8em; margin: 0px; padding: 0px;}
@ -49,7 +42,7 @@ function friends_widget_content(&$a, $conf)
.contact-block-div { display: block !important; float: left!important; width: 50px!important; height: 50px!important; margin: 2px!important;} .contact-block-div { display: block !important; float: left!important; width: 50px!important; height: 50px!important; margin: 2px!important;}
</style>"; </style>";
$o .= _abs_url(HTML::contactBlock()); $o .= _abs_url(ContactBlock::getHTML($owner));
$o .= "<a href='".DI::baseUrl()->get().'/profile/'.$a->profile['nickname']."'>". DI::l10n()->t('Connect on Friendica!') ."</a>"; $o .= "<a href='".DI::baseUrl()->get().'/profile/'.$owner['nickname']."'>". DI::l10n()->t('Connect on Friendica!') ."</a>";
return $o; return $o;
} }