API: fix sender/recipient of PMs: check api_user before get user info.

[friendica.git] / src / App.php

diff --git a/src/App.php b/src/App.php
index f93ae2b9f893da7a94927eb2a3b15a03168cd471..f5626761e59d5ac8327e4d7fb6ada1395f1137a4 100644 (file)
--- a/src/App.php
+++ b/src/App.php
@@ -9,6 +9,8 @@ use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
 use Friendica\Core\System;
+use Friendica\Database\DBM;
+use dba;
 
 use Detection\MobileDetect;
 
@@ -974,6 +976,10 @@ class App
                if ($cat === 'config') {
                        $this->config[$k] = $value;
                } else {
+                       if (!isset($this->config[$cat])) {
+                               $this->config[$cat] = [];
+                       }
+
                        $this->config[$cat][$k] = $value;
                }
        }
@@ -1032,6 +1038,14 @@ class App
                // Only arrays are serialized in database, so we have to unserialize sparingly
                $value = is_string($v) && preg_match("|^a:[0-9]+:{.*}$|s", $v) ? unserialize($v) : $v;
 
+               if (!isset($this->config[$uid])) {
+                       $this->config[$uid] = [];
+               }
+
+               if (!isset($this->config[$uid][$cat])) {
+                       $this->config[$uid][$cat] = [];
+               }
+
                $this->config[$uid][$cat][$k] = $value;
        }
 
@@ -1096,7 +1110,7 @@ class App
                }
 
                //// @TODO Compute the current theme only once (this behavior has
-               /// already been implemented, but it didn' work well -
+               /// already been implemented, but it didn't work well -
                /// https://github.com/friendica/friendica/issues/5092)
                $this->computeCurrentTheme();