Merge pull request #4701 from tobiasd/20180328-msg

[friendica.git] / boot.php

diff --git a/boot.php b/boot.php
index a069dcafc974e43312f0f6bf29141983cab40d0e..e3b94a8c9a4b82baff98bdfc58521123d3dab145 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -20,6 +20,7 @@
 require_once __DIR__ . DIRECTORY_SEPARATOR . 'vendor' . DIRECTORY_SEPARATOR . 'autoload.php';
 
 use Friendica\App;
+use Friendica\BaseObject;
 use Friendica\Core\Addon;
 use Friendica\Core\Cache;
 use Friendica\Core\Config;
@@ -37,10 +38,10 @@ use Friendica\Util\DateTimeFormat;
 require_once 'include/text.php';
 
 define('FRIENDICA_PLATFORM',     'Friendica');
-define('FRIENDICA_CODENAME',     'Asparagus');
-define('FRIENDICA_VERSION',      '3.6-dev');
+define('FRIENDICA_CODENAME',     'The Tazmans Flax-lily');
+define('FRIENDICA_VERSION',      '2018-05-dev');
 define('DFRN_PROTOCOL_VERSION',  '2.23');
-define('DB_UPDATE_VERSION',      1256);
+define('DB_UPDATE_VERSION',      1259);
 define('NEW_UPDATE_ROUTINE_VERSION', 1170);
 
 /**
@@ -536,6 +537,7 @@ function get_app()
 
        if (empty($a)) {
                $a = new App(dirname(__DIR__));
+               BaseObject::setApp($a);
        }
 
        return $a;