aboutsummaryrefslogtreecommitdiffstats
path: root/boot.php
diff options
context:
space:
mode:
authorHilmar R <u02@u29lx193>2021-01-22 01:38:43 +0100
committerHilmar R <u02@u29lx193>2021-01-22 01:38:43 +0100
commit523765b968a5d94a98eee12854fc527d5abbc2e7 (patch)
treea71caba8943c674917821a4afd333eb39ac92b2e /boot.php
parent78f150cfbc1b713bfba3101fdc3f1fd624120637 (diff)
parent254e30bea173e350a24756cbd8cf4acdfe32933e (diff)
downloadvolse-hubzilla-523765b968a5d94a98eee12854fc527d5abbc2e7.tar.gz
volse-hubzilla-523765b968a5d94a98eee12854fc527d5abbc2e7.tar.bz2
volse-hubzilla-523765b968a5d94a98eee12854fc527d5abbc2e7.zip
Merge branch 'master' into air.5
Diffstat (limited to 'boot.php')
-rwxr-xr-xboot.php25
1 files changed, 16 insertions, 9 deletions
diff --git a/boot.php b/boot.php
index 64ec890d5..61622a1fe 100755
--- a/boot.php
+++ b/boot.php
@@ -50,10 +50,10 @@ require_once('include/attach.php');
require_once('include/bbcode.php');
define ( 'PLATFORM_NAME', 'hubzilla' );
-define ( 'STD_VERSION', '5.0.1' );
+define ( 'STD_VERSION', '5.2.1' );
define ( 'ZOT_REVISION', '6.0' );
-define ( 'DB_UPDATE_VERSION', 1238 );
+define ( 'DB_UPDATE_VERSION', 1240 );
define ( 'PROJECT_BASE', __DIR__ );
@@ -82,11 +82,16 @@ define ( 'DIRECTORY_MODE_STANDALONE', 0x0100); // A detached (off the grid) hub
define ( 'DIRECTORY_REALM', 'RED_GLOBAL');
define ( 'DIRECTORY_FALLBACK_MASTER', 'https://hub.netzgemeinde.eu');
-$DIRECTORY_FALLBACK_SERVERS = array(
- 'https://hub.netzgemeinde.eu',
- 'https://zotsite.net',
- 'https://hub.libranet.de'
-);
+
+function get_directory_fallback_servers() {
+ $ret = [
+ 'https://hub.netzgemeinde.eu',
+ 'https://zotsite.net',
+ 'https://hub.libranet.de'
+ ];
+
+ return $ret;
+}
/**
@@ -355,6 +360,7 @@ define ( 'UPDATE_FLAGS_UPDATED', 0x0001);
define ( 'UPDATE_FLAGS_FORCED', 0x0002);
define ( 'UPDATE_FLAGS_DELETED', 0x1000);
+define ( 'HUBLOC_OFFLINE', 0x0001);
define ( 'DROPITEM_NORMAL', 0);
define ( 'DROPITEM_PHASE1', 1);
@@ -433,7 +439,7 @@ define ( 'TERM_FORUM', 11 );
define ( 'TERM_EMOJI', 12 );
define ( 'TERM_OBJ_POST', 1 );
-define ( 'TERM_OBJ_PHOTO', 2 );
+define ( 'TERM_OBJ_FILE', 2 );
define ( 'TERM_OBJ_PROFILE', 3 );
define ( 'TERM_OBJ_CHANNEL', 4 );
define ( 'TERM_OBJ_OBJECT', 5 );
@@ -1207,6 +1213,7 @@ class App {
'$metas' => self::$meta->get(),
'$plugins' => $x['header'],
'$update_interval' => $interval,
+ '$sse_enabled' => get_config('system', 'sse_enabled', 0),
'$head_css' => head_get_css(),
'$head_js' => head_get_js(),
'$linkrel' => head_get_links(),
@@ -2016,7 +2023,7 @@ function proc_run(){
}
$args = array_map('escapeshellarg',$args);
- $cmdline = implode($args," ");
+ $cmdline = implode(' ', $args);
if(is_windows()) {
$cwd = getcwd();