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

Merge pull request #5644 from annando/notices 

And again ... notices
This commit is contained in:
Tobias Diekershoff 2018-08-21 06:06:52 +02:00 committed by GitHub
parent d9b44153da 334c628511
commit 5a171c0afd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Protocol/Diaspora.php
View File

@ -1821,10 +1821,10 @@ class Diaspora
"to_name" => $importer["username"], "to_name" => $importer["username"],
"to_email" => $importer["email"], "to_email" => $importer["email"],
"uid" =>$importer["uid"], "uid" =>$importer["uid"],
"item" => ["subject" => $subject, "body" => $body], "item" => ["id" => $conversation["id"], "title" => $subject, "subject" => $subject, "body" => $body],
"source_name" => $person["name"], "source_name" => $person["name"],
"source_link" => $person["url"], "source_link" => $person["url"],
"source_photo" => $person["thumb"], "source_photo" => $person["photo"],
"verb" => ACTIVITY_POST, "verb" => ACTIVITY_POST,
"otype" => "mail"] "otype" => "mail"]
); );

4
view/theme/frio/php/default.php
View File

@ -44,7 +44,7 @@ if (!isset($minimal)) {
$uid = Profile::getThemeUid(); $uid = Profile::getThemeUid();
} }
$scheme = PConfig::get($uid, 'frio', 'scheme', PConfig::get($uid, 'frio', 'schema')); $scheme = PConfig::get($uid, 'frio', 'scheme', PConfig::get($uid, 'frio', 'schema'));
if (($scheme) && ($scheme != '---')) { if ($scheme && ($scheme != '---')) {
if (file_exists('view/theme/frio/scheme/' . $scheme . '.php')) { if (file_exists('view/theme/frio/scheme/' . $scheme . '.php')) {
$schemefile = 'view/theme/frio/scheme/' . $scheme . '.php'; $schemefile = 'view/theme/frio/scheme/' . $scheme . '.php';
require_once $schemefile; require_once $schemefile;
@ -52,7 +52,7 @@ if (!isset($minimal)) {
} else { } else {
$nav_bg = PConfig::get($uid, 'frio', 'nav_bg'); $nav_bg = PConfig::get($uid, 'frio', 'nav_bg');
} }
if (!$nav_bg) { if (empty($nav_bg)) {
$nav_bg = "#708fa0"; $nav_bg = "#708fa0";
} }
echo ' echo '