And again ... notices
authorMichael <heluecht@pirati.ca>
Mon, 20 Aug 2018 21:20:21 +0000 (21:20 +0000)
committerMichael <heluecht@pirati.ca>
Mon, 20 Aug 2018 21:20:21 +0000 (21:20 +0000)
src/Protocol/Diaspora.php
view/theme/frio/php/default.php

index 8decec0..d833f41 100644 (file)
@@ -1821,10 +1821,10 @@ class Diaspora
                        "to_name" => $importer["username"],
                        "to_email" => $importer["email"],
                        "uid" =>$importer["uid"],
-                       "item" => ["subject" => $subject, "body" => $body],
+                       "item" => ["id" => $conversation["id"], "title" => $subject, "subject" => $subject, "body" => $body],
                        "source_name" => $person["name"],
                        "source_link" => $person["url"],
-                       "source_photo" => $person["thumb"],
+                       "source_photo" => $person["photo"],
                        "verb" => ACTIVITY_POST,
                        "otype" => "mail"]
                );
index 28f4450..cb68328 100644 (file)
@@ -44,7 +44,7 @@ if (!isset($minimal)) {
                        $uid = Profile::getThemeUid();
                }
                $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')) {
                                $schemefile = 'view/theme/frio/scheme/' . $scheme . '.php';
                                require_once $schemefile;
@@ -52,7 +52,7 @@ if (!isset($minimal)) {
                } else {
                        $nav_bg = PConfig::get($uid, 'frio', 'nav_bg');
                }
-               if (!$nav_bg) {
+               if (empty($nav_bg)) {
                        $nav_bg = "#708fa0";
                }
                echo '