Merge pull request #5109 from rabuzarus/20180522_-_frio_nav_about_instance

[friendica.git] / src / App.php

diff --git a/src/App.php b/src/App.php
index f08f6f66dca4a32955e82c0ab2ce718fc9d2fb7e..655ea84f00d958008c6d7c8fffcf6d0ed8adb1a6 100644 (file)
--- a/src/App.php
+++ b/src/App.php
@@ -861,18 +861,6 @@ class App
                        return;
                }
 
-               // If the last worker fork was less than 2 seconds before then don't fork another one.
-               // This should prevent the forking of masses of workers.
-               $cachekey = 'app:proc_run:started';
-               $result = Cache::get($cachekey);
-
-               if (!is_null($result) && ( time() - $result) < 2) {
-                       return;
-               }
-
-               // Set the timestamp of the last proc_run
-               Cache::set($cachekey, time(), CACHE_MINUTE);
-
                array_unshift($args, ((x($this->config, 'php_path')) && (strlen($this->config['php_path'])) ? $this->config['php_path'] : 'php'));
 
                for ($x = 0; $x < count($args); $x ++) {
@@ -1103,6 +1091,10 @@ class App
         */
        public function getCurrentTheme()
        {
+               if ($this->mode == App::MODE_INSTALL) {
+                       return '';
+               }
+
                if (!$this->current_theme) {
                        $this->computeCurrentTheme();
                }