Quoted posts from Twitter now contain media again

[friendica.git] / src / App.php

diff --git a/src/App.php b/src/App.php
index 2d635951bec303bcbfcc5455fef2705f29c9986c..a141adf4917c015eb57acfa3399834d765553246 100644 (file)
--- a/src/App.php
+++ b/src/App.php
@@ -586,7 +586,7 @@ class App
                $this->profiler->set(microtime(true), 'classinit');
 
                $moduleName = $this->args->getModuleName();
-               $page->setLogging($this->args->getCommand(), $this->args->getMethod());
+               $page->setLogging($this->args->getMethod(), $this->args->getModuleName(), $this->args->getCommand());
 
                try {
                        // Missing DB connection: ERROR
@@ -614,9 +614,9 @@ class App
                        if (!empty($_GET['zrl']) && $this->mode->isNormal() && !$this->mode->isBackend() && !local_user()) {
                                // Only continue when the given profile link seems valid
                                // Valid profile links contain a path with "/profile/" and no query parameters
-                               if ((parse_url($_GET['zrl'], PHP_URL_QUERY) == "") &&
-                                       strstr(parse_url($_GET['zrl'], PHP_URL_PATH), "/profile/")) {
-                                       if (Core\Session::get('visitor_home') != $_GET["zrl"]) {
+                               if ((parse_url($_GET['zrl'], PHP_URL_QUERY) == '') &&
+                                       strstr(parse_url($_GET['zrl'], PHP_URL_PATH), '/profile/')) {
+                                       if (Core\Session::get('visitor_home') != $_GET['zrl']) {
                                                Core\Session::set('my_url', $_GET['zrl']);
                                                Core\Session::set('authenticated', 0);
 
@@ -648,10 +648,6 @@ class App
                                header('X-Account-Management-Status: none');
                        }
 
-                       $_SESSION['sysmsg']       = Core\Session::get('sysmsg', []);
-                       $_SESSION['sysmsg_info']  = Core\Session::get('sysmsg_info', []);
-                       $_SESSION['last_updated'] = Core\Session::get('last_updated', []);
-
                        /*
                         * check_config() is responsible for running update scripts. These automatically
                         * update the DB schema whenever we push a new one out. It also checks to see if
@@ -705,7 +701,8 @@ class App
                        // Initialize module that can set the current theme in the init() method, either directly or via App->setProfileOwner
                        $page['page_title'] = $moduleName;
 
-                       if (!$this->mode->isInstall() && !$this->mode->has(App\Mode::MAINTENANCEDISABLED)) {
+                       // The "view" module is required to show the theme CSS
+                       if (!$this->mode->isInstall() && !$this->mode->has(App\Mode::MAINTENANCEDISABLED) && $moduleName !== 'view') {
                                $module = $router->getModule(Maintenance::class);
                        } else {
                                // determine the module class and save it to the module instance