Merge pull request #1372 from tobiasd/20150207fr

[friendica.git] / boot.php

diff --git a/boot.php b/boot.php
index 7a6f4bd4e1e0a9cd32d36c71393bbb050f9dfb63..dd6bc6ac5d6f6c58b9fcb7ca28a0c7898dcde193 100644 (file)
--- 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.3-RC' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
-define ( 'DB_UPDATE_VERSION',      1174      );
+define ( 'DB_UPDATE_VERSION',      1178      );
 define ( 'EOL',                    "<br />\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());
@@ -1405,11 +1405,11 @@ if(! function_exists('get_max_import_size')) {
 if(! function_exists('profile_load')) {
        function profile_load(&$a, $nickname, $profile = 0, $profiledata = array()) {
 
-               $user = q("select uid from user where nickname = '%s' limit 1",
+               $user = q("SELECT `uid` FROM `user` WHERE `nickname` = '%s' LIMIT 1",
                        dbesc($nickname)
                );
 
-               if(! ($user && count($user))) {
+               if(!$user && count($user) && !count($profiledata)) {
                        logger('profile error: ' . $a->query_string, LOGGER_DEBUG);
                        notice( t('Requested account is not available.') . EOL );
                        $a->error = 404;
@@ -1440,7 +1440,7 @@ if(! function_exists('profile_load')) {
                                        intval($profile_int)
                        );
                }
-               if((! $r) && (!  count($r))) {
+               if((!$r) && (!count($r))) {
                        $r = q("SELECT `profile`.`uid` AS `profile_uid`, `profile`.* , `contact`.`avatar-date` AS picdate, `user`.* FROM `profile`
                                        INNER JOIN `contact` on `contact`.`uid` = `profile`.`uid` INNER JOIN `user` ON `profile`.`uid` = `user`.`uid`
                                        WHERE `user`.`nickname` = '%s' AND `profile`.`is-default` = 1 and `contact`.`self` = 1 LIMIT 1",
@@ -1448,7 +1448,7 @@ if(! function_exists('profile_load')) {
                        );
                }
 
-               if(($r === false) || (! count($r))) {
+               if(($r === false) || (!count($r)) && !count($profiledata)) {
                        logger('profile error: ' . $a->query_string, LOGGER_DEBUG);
                        notice( t('Requested profile is not available.') . EOL );
                        $a->error = 404;
@@ -1457,7 +1457,7 @@ if(! function_exists('profile_load')) {
 
                // fetch user tags if this isn't the default profile
 
-               if(! $r[0]['is-default']) {
+               if(!$r[0]['is-default']) {
                        $x = q("select `pub_keywords` from `profile` where uid = %d and `is-default` = 1 limit 1",
                                        intval($r[0]['profile_uid'])
                        );
@@ -1649,8 +1649,10 @@ if(! function_exists('profile_sidebar')) {
 
                $homepage = ((x($profile,'homepage') == 1) ?  t('Homepage:') : False);
 
+               $about = ((x($profile,'about') == 1) ?  t('About:') : False);
+
                if(($profile['hidewall'] || $block) && (! local_user()) && (! remote_user())) {
-                       $location = $pdesc = $gender = $marital = $homepage = False;
+                       $location = $pdesc = $gender = $marital = $homepage = $about = False;
                }
 
                $firstname = ((strpos($profile['name'],' '))
@@ -1695,6 +1697,7 @@ if(! function_exists('profile_sidebar')) {
                        '$pdesc'        => $pdesc,
                        '$marital'  => $marital,
                        '$homepage' => $homepage,
+                       '$about' => $about,
                        '$network' =>  t('Network:'),
                        '$diaspora' => $diaspora,
                        '$contact_block' => $contact_block,
@@ -2071,7 +2074,7 @@ if(! function_exists('load_contact_links')) {
                if(! $uid || x($a->contacts,'empty'))
                        return;
 
-               $r = q("SELECT `id`,`network`,`url`,`thumb` FROM `contact` WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 ",
+               $r = q("SELECT `id`,`network`,`url`,`thumb` FROM `contact` WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 AND `thumb` != ''",
                                intval($uid)
                );
                if(count($r)) {