Merge https://github.com/friendica/friendica into pull

[friendica.git] / boot.php

diff --git a/boot.php b/boot.php
index 94b9fdc8f78b7fb922c1715c4f905c1f0c813543..70d27ebce8ae0912e8249b0691cd3935a54b7b4e 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -12,7 +12,7 @@ require_once('library/Mobile_Detect/Mobile_Detect.php');
 require_once('include/features.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '3.1.1677' );
+define ( 'FRIENDICA_VERSION',      '3.1.1714' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 define ( 'DB_UPDATE_VERSION',      1163      );
 define ( 'EOL',                    "<br />\r\n"     );
@@ -423,6 +423,7 @@ if(! class_exists('App')) {
                        $this->performance["start"] = microtime(true);
                        $this->performance["database"] = 0;
                        $this->performance["network"] = 0;
+                       $this->performance["file"] = 0;
                        $this->performance["rendering"] = 0;
                        $this->performance["parser"] = 0;
                        $this->performance["marktime"] = 0;
@@ -436,6 +437,14 @@ if(! class_exists('App')) {
 
                        startup();
 
+                       set_include_path(
+                                       'include' . PATH_SEPARATOR
+                                       . 'library' . PATH_SEPARATOR
+                                       . 'library/phpsec' . PATH_SEPARATOR
+                                       . 'library/langdet' . PATH_SEPARATOR
+                                       . '.' );
+
+
                        $this->scheme = 'http';
                        if(x($_SERVER,'HTTPS') && $_SERVER['HTTPS'])
                                $this->scheme = 'https';
@@ -470,15 +479,8 @@ if(! class_exists('App')) {
                                $argc --;
                        }
 
-                       set_include_path(
-                                       "include/$this->hostname" . PATH_SEPARATOR
-                                       . 'include' . PATH_SEPARATOR
-                                       . 'library' . PATH_SEPARATOR
-                                       . 'library/phpsec' . PATH_SEPARATOR
-                                       . 'library/langdet' . PATH_SEPARATOR
-                                       . '.' );
+                       set_include_path("include/$this->hostname" . PATH_SEPARATOR . get_include_path());
             
-
                        if((x($_SERVER,'QUERY_STRING')) && substr($_SERVER['QUERY_STRING'],0,2) === "q=") {
                                $this->query_string = substr($_SERVER['QUERY_STRING'],2);
                                // removing trailing / - maybe a nginx problem
@@ -1955,6 +1957,13 @@ if(! function_exists('profile_tabs')){
                                'title' => t('Photo Albums'),
                                'id' => 'photo-tab',
                        ),
+                       array(
+                               'label' => t('Videos'),
+                               'url'   => $a->get_baseurl() . '/videos/' . $nickname,
+                               'sel'   => ((!isset($tab)&&$a->argv[0]=='videos')?'active':''),
+                               'title' => t('Videos'),
+                               'id' => 'video-tab',
+                       ),
                );
        
                if ($is_owner){
@@ -2098,10 +2107,7 @@ function random_digits($digits) {
 function get_cachefile($file, $writemode = true) {
        $cache = get_config("system","itemcache");
 
-       if ($cache == "")
-               return("");
-
-       if (!is_dir($cache))
+       if ((! $cache) || (! is_dir($cache)))
                return("");
 
        $subfolder = $cache."/".substr($file, 0, 2);