friendica/friendica
6
0
Fork 1
mirror of https://github.com/friendica/friendica synced 2024-06-03 17:15:05 +02:00
Code Issues Packages Projects Releases 1 Wiki Activity

placeholder for a funny commit description for removing some more notices (#5631)

Browse source
This commit is contained in:
Michael Vogel 2018-08-19 03:52:21 +02:00 committed by Hypolite Petovan
parent 060e887a31
commit ab5cedfa50
4 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
mod/match.php
View file

@ -94,11 +94,11 @@ function match_content(App $a)
$entry = [ $entry = [
'url' => Contact::magicLink($jj->url), 'url' => Contact::magicLink($jj->url),
'itemurl' => (($contact_details['addr'] != "") ? $contact_details['addr'] : $jj->url), 'itemurl' => defaults($contact_details, 'addr', $jj->url),
'name' => $jj->name, 'name' => $jj->name,
'details' => $contact_details['location'], 'details' => defaults($contact_details, 'location', ''),
'tags' => $contact_details['keywords'], 'tags' => defaults($contact_details, 'keywords', ''),
'about' => $contact_details['about'], 'about' => defaults($contact_details, 'about', ''),
'account_type' => Contact::getAccountType($contact_details), 'account_type' => Contact::getAccountType($contact_details),
'thumb' => ProxyUtils::proxifyUrl($jj->photo, false, ProxyUtils::SIZE_THUMB), 'thumb' => ProxyUtils::proxifyUrl($jj->photo, false, ProxyUtils::SIZE_THUMB),
'inttxt' => ' ' . L10n::t('is interested in:'), 'inttxt' => ' ' . L10n::t('is interested in:'),

6
mod/profperm.php
View file

@ -82,7 +82,7 @@ function profperm_content(App $a) {
$members = $r; $members = $r;
if($change) { if (!empty($change)) {
if (in_array($change,$ingroup)) { if (in_array($change,$ingroup)) {
q("UPDATE `contact` SET `profile-id` = 0 WHERE `id` = %d AND `uid` = %d", q("UPDATE `contact` SET `profile-id` = 0 WHERE `id` = %d AND `uid` = %d",
intval($change), intval($change),
@ -120,7 +120,7 @@ function profperm_content(App $a) {
} }
$o .= '<div id="prof-update-wrapper">'; $o .= '<div id="prof-update-wrapper">';
if($change) if (!empty($change))
$o = ''; $o = '';
$o .= '<div id="prof-members-title">'; $o .= '<div id="prof-members-title">';
@ -162,7 +162,7 @@ function profperm_content(App $a) {
$o .= '</div><div id="prof-all-contacts-end"></div>'; $o .= '</div><div id="prof-all-contacts-end"></div>';
if($change) { if (!empty($change)) {
echo $o; echo $o;
killme(); killme();
} }

1
mod/videos.php
View file

@ -365,6 +365,7 @@ function videos_content(App $a)
if (DBA::isResult($r)) { if (DBA::isResult($r)) {
foreach ($r as $rr) { foreach ($r as $rr) {
$alt_e = $rr['filename']; $alt_e = $rr['filename'];
/// @todo The album isn't part of the above query. This seems to be some unfinished code that needs to be reworked completely.
$name_e = $rr['album']; $name_e = $rr['album'];
$videos[] = [ $videos[] = [

2
src/Model/Event.php
View file

@ -62,7 +62,7 @@ class Event extends BaseObject
$o .= "<h4>" . L10n::t('Finishes:') . "</h4><p>" . $event_end . "</p>"; $o .= "<h4>" . L10n::t('Finishes:') . "</h4><p>" . $event_end . "</p>";
} }
if (strlen($event['location'])) { if (!empty($event['location'])) {
$o .= "<h4>" . L10n::t('Location:') . "</h4><p>" . BBCode::convert($event['location'], false, $simple) . "</p>"; $o .= "<h4>" . L10n::t('Location:') . "</h4><p>" . BBCode::convert($event['location'], false, $simple) . "</p>";
} }