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

Once again, notices ... (#5535)

Browse Source
This commit is contained in:
Michael Vogel
2018-07-31 18:39:23 +02:00
committed by Tobias Diekershoff
parent 4bd7daa205
commit 71b1638d9a
6 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Model/Event.php
+6 -2
View File
@@ -48,9 +48,13 @@ class Event extends BaseObject
}
if ($simple) {
$o = "<h3>" . BBCode::convert($event['summary'], false, $simple) . "</h3>";
if (!empty($event['summary'])) {
$o = "<h3>" . BBCode::convert($event['summary'], false, $simple) . "</h3>";
}
$o .= "<div>" . BBCode::convert($event['desc'], false, $simple) . "</div>";
if (!empty($event['desc'])) {
$o .= "<div>" . BBCode::convert($event['desc'], false, $simple) . "</div>";
}
$o .= "<h4>" . L10n::t('Starts:') . "</h4><p>" . $event_start . "</p>";
src/Model/GContact.php
+4
View File
@@ -705,6 +705,10 @@ class GContact
$doprobing = (((time() - $last_contact) > (90 * 86400)) && ((time() - $last_failure) > (90 * 86400)));
}
} else {
$contact['location'] = defaults($contact, 'location', '');
$contact['about'] = defaults($contact, 'about', '');
$contact['generation'] = defaults($contact, 'generation', 0);
q(
"INSERT INTO `gcontact` (`name`, `nick`, `addr` , `network`, `url`, `nurl`, `photo`, `created`, `updated`, `location`, `about`, `hide`, `generation`)
VALUES ('%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d)",