Merge pull request #3799 from tobiasd/20171017-doc

[friendica.git] / boot.php

diff --git a/boot.php b/boot.php
index db5903829da4fff3ad4abfa3444eecb47889a86f..899a6bd119ca4b8cbbb2bd9b13a95c49ea723892 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -41,7 +41,7 @@ require_once 'include/poller.php';
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
 define ( 'FRIENDICA_CODENAME',     'Asparagus');
-define ( 'FRIENDICA_VERSION',      '3.5.3-rc' );
+define ( 'FRIENDICA_VERSION',      '3.6-dev' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 define ( 'DB_UPDATE_VERSION',      1234      );
 
@@ -510,6 +510,11 @@ function startup() {
  */
 function get_app() {
        global $a;
+
+       if (empty($a)) {
+               $a = new App(dirname(__DIR__));
+       }
+
        return $a;
 }
 
@@ -591,6 +596,11 @@ function is_ajax() {
        return (!empty($_SERVER['HTTP_X_REQUESTED_WITH']) && strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) == 'xmlhttprequest');
 }
 
+/**
+ * @brief Function to check if request was an AJAX (xmlhttprequest) request.
+ *
+ * @param $via_worker boolean Is the check run via the poller?
+ */
 function check_db($via_worker) {
 
        $build = get_config('system', 'build');