bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

Merge pull request #6900 from annando/fix-error

Browse source 
Fixes errors/notices
This commit is contained in:
Philipp 2019-03-17 23:53:05 +01:00 committed by GitHub
parent ab61a7a902 2cdd5a4940
commit 634edc183b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/Protocol/ActivityPub/Processor.php
View file

@ -48,7 +48,7 @@ class Processor
*
* @return string with replaced emojis
*/
public static function replaceEmojis($body, array $emojis)
private static function replaceEmojis($body, array $emojis)
{
foreach ($emojis as $emoji) {
$replace = '[class=emoji mastodon][img=' . $emoji['href'] . ']' . $emoji['name'] . '[/img][/class]';
@ -263,7 +263,11 @@ class Processor
$item['body'] = $activity['source'];
} else {
$content = HTML::toBBCode($activity['content']);
if (!empty($activity['emojis'])) {
$content = self::replaceEmojis($content, $activity['emojis']);
}
$content = self::convertMentions($content);
if (($item['thr-parent'] != $item['uri']) && ($item['gravity'] == GRAVITY_COMMENT)) {

2
view/theme/frio/php/default.php
View file

@ -53,7 +53,7 @@ $is_singleuser_class = $is_singleuser ? "is-singleuser" : "is-not-singleuser";
$nav_bg = PConfig::get($uid, 'frio', 'nav_bg');
}
if (empty($nav_bg)) {
if (empty($nav_bg) || !is_string($nav_bg)) {
$nav_bg = "#708fa0";
}