- Remove TinyMCE mentions in themes

[friendica.git] / boot.php

diff --git a/boot.php b/boot.php
index 70f7d324d3e383cf2ffd2372305e983a5e25a790..cd6db384a2486a3ff78643b90486694713657ec3 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',      1209      );
+define ( 'DB_UPDATE_VERSION',      1212      );
 
 /**
  * @brief Constant with a HTML line break.
@@ -809,7 +809,7 @@ class App {
        function get_baseurl($ssl = false) {
 
                // Is the function called statically?
-               if (!is_object($this)) {
+               if (!(isset($this) && get_class($this) == __CLASS__)) {
                        return self::$a->get_baseurl($ssl);
                }
 
@@ -1053,7 +1053,7 @@ class App {
        function remove_baseurl($orig_url){
 
                // Is the function called statically?
-               if (!is_object($this)) {
+               if (!(isset($this) && get_class($this) == __CLASS__)) {
                        return(self::$a->remove_baseurl($orig_url));
                }
 
@@ -1540,7 +1540,7 @@ function check_db() {
  * Sets the base url for use in cmdline programs which don't have
  * $_SERVER variables
  */
-function check_url(App &$a) {
+function check_url(App $a) {
 
        $url = get_config('system','url');
 
@@ -1562,7 +1562,7 @@ function check_url(App &$a) {
 /**
  * @brief Automatic database updates
  */
-function update_db(App &$a) {
+function update_db(App $a) {
        $build = get_config('system','build');
        if(! x($build))
                $build = set_config('system','build',DB_UPDATE_VERSION);
@@ -1678,7 +1678,7 @@ function run_update_function($x) {
  * @param App $a
  *
         */
-function check_plugins(App &$a) {
+function check_plugins(App $a) {
 
        $r = q("SELECT * FROM `addon` WHERE `installed` = 1");
        if (dbm::is_result($r))
@@ -2414,7 +2414,7 @@ function get_temppath() {
 }
 
 /// @deprecated
-function set_template_engine(App &$a, $engine = 'internal') {
+function set_template_engine(App $a, $engine = 'internal') {
 /// @note This function is no longer necessary, but keep it as a wrapper to the class method
 /// to avoid breaking themes again unnecessarily