X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FApp.php;h=7c7496c3baf138a0b47d66b9241d2653d39354eb;hb=c3554ac0f4dbcc4516ca3c9a9cd8c8fa9f9163ea;hp=4342e57ece84bd902f8c11a92985fb8921dead45;hpb=28090bd79376f3a7c0708eeb4e36a25fd782c240;p=friendica.git

diff --git a/src/App.php b/src/App.php
index 4342e57ece..7c7496c3ba 100644
--- a/src/App.php
+++ b/src/App.php
@@ -25,6 +25,7 @@ use Exception;
 use Friendica\App\Arguments;
 use Friendica\App\BaseURL;
 use Friendica\App\Module;
+use Friendica\Factory\ConfigFactory;
 use Friendica\Module\Maintenance;
 use Friendica\Security\Authentication;
 use Friendica\Core\Config\Cache;
@@ -36,7 +37,6 @@ use Friendica\Core\Theme;
 use Friendica\Database\Database;
 use Friendica\Model\Contact;
 use Friendica\Model\Profile;
-use Friendica\Model\User;
 use Friendica\Module\Special\HTTPException as ModuleHTTPException;
 use Friendica\Network\HTTPException;
 use Friendica\Util\ConfigFileLoader;
@@ -133,7 +133,7 @@ class App
 	 * @param int $user_id
 	 * @return void
 	 */
-	public function setUserId(int $user_id)
+	public function setLoggedInUserId(int $user_id)
 	{
 		$this->user_id = $user_id;
 	}
@@ -144,7 +144,7 @@ class App
 	 * @param int $user_id
 	 * @return void
 	 */
-	public function setNickname(string $nickname)
+	public function setLoggedInUserNickname(string $nickname)
 	{
 		$this->nickname = $nickname;
 	}
@@ -158,7 +158,7 @@ class App
 	 * Fetch the user id
 	 * @return int 
 	 */
-	public function getUserId()
+	public function getLoggedInUserId()
 	{
 		return $this->user_id;
 	}
@@ -167,7 +167,7 @@ class App
 	 * Fetch the user nick name
 	 * @return string
 	 */
-	public function getNickname()
+	public function getLoggedInUserNickname()
 	{
 		return $this->nickname;
 	}
@@ -353,7 +353,7 @@ class App
 			$this->profiler->update($this->config);
 
 			Core\Hook::loadHooks();
-			$loader = new ConfigFileLoader($this->getBasePath());
+			$loader = (new ConfigFactory())->createConfigFileLoader($this->getBasePath(), $_SERVER);
 			Core\Hook::callAll('load_config', $loader);
 		}