X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=boot.php;h=5e21859a14d98d0519ad1720effcb110bf382d49;hb=a888b59c42e1536d72dd8376f6fe293aa12485c0;hp=96a55a0997beccfeec7ddfb49fe5f7f7761086c6;hpb=9553aeb3bd26e3e18b7677a26982a6b1df4c55fb;p=friendica.git diff --git a/boot.php b/boot.php index 96a55a0997..5e21859a14 100644 --- a/boot.php +++ b/boot.php @@ -11,7 +11,7 @@ require_once('include/cache.php'); require_once('library/Mobile_Detect/Mobile_Detect.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '3.0.1435' ); +define ( 'FRIENDICA_VERSION', '3.0.1449' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DB_UPDATE_VERSION', 1154 ); @@ -253,6 +253,7 @@ define ( 'ACTIVITY_TAG', NAMESPACE_ACTIVITY_SCHEMA . 'tag' ); define ( 'ACTIVITY_FAVORITE', NAMESPACE_ACTIVITY_SCHEMA . 'favorite' ); define ( 'ACTIVITY_POKE', NAMESPACE_ZOT . '/activity/poke' ); +define ( 'ACTIVITY_MOOD', NAMESPACE_ZOT . '/activity/mood' ); define ( 'ACTIVITY_OBJ_COMMENT', NAMESPACE_ACTIVITY_SCHEMA . 'comment' ); define ( 'ACTIVITY_OBJ_NOTE', NAMESPACE_ACTIVITY_SCHEMA . 'note' ); @@ -904,6 +905,10 @@ if(! function_exists('login')) { $tpl = get_markup_template("logout.tpl"); } else { + $a->page['htmlhead'] .= replace_macros(get_markup_template("login_head.tpl"),array( + '$baseurl' => $a->get_baseurl(true) + )); + $tpl = get_markup_template("login.tpl"); $_SESSION['return_url'] = $a->query_string; } @@ -1471,7 +1476,10 @@ if(! function_exists('proc_run')) { $args[$x] = escapeshellarg($args[$x]); $cmdline = implode($args," "); - proc_close(proc_open($cmdline." &",array(),$foo)); + if(get_config('system','proc_windows')) + proc_close(proc_open('start /b ' . $cmdline,array(),$foo)); + else + proc_close(proc_open($cmdline." &",array(),$foo)); } }