Disable richtext editor for frio - followup for #2938

[friendica.git] / boot.php

diff --git a/boot.php b/boot.php
index 230cbc1e3a43a7f24fe1a10f6cff3ed2dddc3518..d0215e81f2882334e53ddd043f5e1ade5aa77293 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -38,7 +38,7 @@ define ( 'FRIENDICA_PLATFORM',     'Friendica');
 define ( 'FRIENDICA_CODENAME',     'Asparagus');
 define ( 'FRIENDICA_VERSION',      '3.5.1-dev' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
-define ( 'DB_UPDATE_VERSION',      1208      );
+define ( 'DB_UPDATE_VERSION',      1209      );
 
 /**
  * @brief Constant with a HTML line break.
@@ -530,6 +530,7 @@ class App {
        public  $videoheight = 350;
        public  $force_max_items = 0;
        public  $theme_thread_allow = true;
+       public  $theme_richtext_editor = true;
        public  $theme_events_in_profile = true;
 
        /**
@@ -609,6 +610,7 @@ class App {
                $this->performance["markstart"] = microtime(true);
 
                $this->callstack["database"] = array();
+               $this->callstack["database_write"] = array();
                $this->callstack["network"] = array();
                $this->callstack["file"] = array();
                $this->callstack["rendering"] = array();
@@ -1041,7 +1043,7 @@ class App {
        /**
         * @brief Removes the baseurl from an url. This avoids some mixed content problems.
         *
-        * @param string $url
+        * @param string $orig_url
         *
         * @return string The cleaned url
         */
@@ -1049,13 +1051,13 @@ class App {
 
                // Is the function called statically?
                if (!is_object($this)) {
-                       return(self::$a->remove_baseurl($url));
+                       return(self::$a->remove_baseurl($orig_url));
                }
 
                // Remove the hostname from the url if it is an internal link
-               $url = normalise_link($orig_url);
+               $nurl = normalise_link($orig_url);
                $base = normalise_link($this->get_baseurl());
-               $url = str_replace($base."/", "", $url);
+               $url = str_replace($base."/", "", $nurl);
 
                // if it is an external link return the orignal value
                if ($url == normalise_link($orig_url)) {
@@ -1384,6 +1386,10 @@ class App {
 
        function proc_run($args) {
 
+               if (!function_exists("proc_open")) {
+                       return;
+               }
+
                // Add the php path if it is a php call
                if (count($args) && ($args[0] === 'php' OR !is_string($args[0]))) {