friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Fixes errors/notices

This commit is contained in:
Michael 2019-03-17 22:13:17 +00:00
parent ab61a7a902
commit 2cdd5a4940
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Protocol/ActivityPub/Processor.php
View File

@ -48,7 +48,7 @@ class Processor
* *
* @return string with replaced emojis * @return string with replaced emojis
*/ */
public static function replaceEmojis($body, array $emojis) private static function replaceEmojis($body, array $emojis)
{ {
foreach ($emojis as $emoji) { foreach ($emojis as $emoji) {
$replace = '[class=emoji mastodon][img=' . $emoji['href'] . ']' . $emoji['name'] . '[/img][/class]'; $replace = '[class=emoji mastodon][img=' . $emoji['href'] . ']' . $emoji['name'] . '[/img][/class]';
@ -263,7 +263,11 @@ class Processor
$item['body'] = $activity['source']; $item['body'] = $activity['source'];
} else { } else {
$content = HTML::toBBCode($activity['content']); $content = HTML::toBBCode($activity['content']);
$content = self::replaceEmojis($content, $activity['emojis']);
if (!empty($activity['emojis'])) {
$content = self::replaceEmojis($content, $activity['emojis']);
}
$content = self::convertMentions($content); $content = self::convertMentions($content);
if (($item['thr-parent'] != $item['uri']) && ($item['gravity'] == GRAVITY_COMMENT)) { 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'); $nav_bg = PConfig::get($uid, 'frio', 'nav_bg');
} }
if (empty($nav_bg)) { if (empty($nav_bg) || !is_string($nav_bg)) {
$nav_bg = "#708fa0"; $nav_bg = "#708fa0";
} }