Reverted accidentally reversed parameter order

[friendica.git] / src / App.php

diff --git a/src/App.php b/src/App.php
index 792df0f74832752ec52a8419974cd2c018959412..495cfb8b0a127d957325e474aa600e7bbeed1235 100644 (file)
--- a/src/App.php
+++ b/src/App.php
@@ -64,7 +64,7 @@ class App
 {
        const PLATFORM = 'Friendica';
        const CODENAME = 'Giant Rhubarb';
-       const VERSION  = '2023.03-dev';
+       const VERSION  = '2023.06-dev';
 
        // Allow themes to control internal parameters
        // by changing App values in theme.php
@@ -335,7 +335,13 @@ class App
         */
        protected function load(DbaDefinition $dbaDefinition, ViewDefinition $viewDefinition)
        {
-               set_time_limit(0);
+               if ($this->config->get('system', 'ini_max_execution_time') !== false) {
+                       set_time_limit((int)$this->config->get('system', 'ini_max_execution_time'));
+               }
+
+               if ($this->config->get('system', 'ini_pcre_backtrack_limit') !== false) {
+                       ini_set('pcre.backtrack_limit', (int)$this->config->get('system', 'ini_pcre_backtrack_limit'));
+               }
 
                // Normally this constant is defined - but not if "pcntl" isn't installed
                if (!defined('SIGTERM')) {
@@ -345,9 +351,6 @@ class App
                // Ensure that all "strtotime" operations do run timezone independent
                date_default_timezone_set('UTC');
 
-               // This has to be quite large to deal with embedded private photos
-               ini_set('pcre.backtrack_limit', 500000);
-
                set_include_path(
                        get_include_path() . PATH_SEPARATOR
                        . $this->getBasePath() . DIRECTORY_SEPARATOR . 'include' . PATH_SEPARATOR
@@ -391,7 +394,7 @@ class App
        }
 
        /**
-        * Returns the current theme name. May be overriden by the mobile theme name.
+        * Returns the current theme name. May be overridden by the mobile theme name.
         *
         * @return string Current theme name or empty string in installation phase
         * @throws Exception
@@ -532,7 +535,7 @@ class App
        /**
         * Provide a sane default if nothing is chosen or the specified theme does not exist.
         *
-        * @return string Current theme's stylsheet path
+        * @return string Current theme's stylesheet path
         * @throws Exception
         */
        public function getCurrentThemeStylesheetPath(): string