X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=boot.php;h=2e76292f4558af015e8bea311c20e50a078f4d2f;hb=cce561708a21b89f042a9ad812aca3a4a2abd9b3;hp=7a6f4bd4e1e0a9cd32d36c71393bbb050f9dfb63;hpb=3069e5eb1a01fb2823521473c34c251d04e19b4e;p=friendica.git diff --git a/boot.php b/boot.php index 7a6f4bd4e1..2e76292f45 100644 --- a/boot.php +++ b/boot.php @@ -15,10 +15,10 @@ require_once('update.php'); require_once('include/dbstructure.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_CODENAME', 'Ginger'); -define ( 'FRIENDICA_VERSION', '3.3.1' ); +define ( 'FRIENDICA_CODENAME', 'Ginger'); +define ( 'FRIENDICA_VERSION', '3.3.2' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); -define ( 'DB_UPDATE_VERSION', 1174 ); +define ( 'DB_UPDATE_VERSION', 1175 ); define ( 'EOL', "
\r\n" ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); @@ -435,7 +435,7 @@ if(! class_exists('App')) { function __construct() { - global $default_timezone, $argv, $argc; + global $default_timezone; $hostname = ""; @@ -504,9 +504,9 @@ if(! class_exists('App')) { if ($hostname != "") $this->hostname = $hostname; - if (is_array($argv) && $argc>1 && substr(end($argv), 0, 4)=="http" ) { - $this->set_baseurl(array_pop($argv) ); - $argc --; + if (is_array($_SERVER["argv"]) && $_SERVER["argc"]>1 && substr(end($_SERVER["argv"]), 0, 4)=="http" ) { + $this->set_baseurl(array_pop($_SERVER["argv"]) ); + $_SERVER["argc"] --; } #set_include_path("include/$this->hostname" . PATH_SEPARATOR . get_include_path());