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

diff --combined boot.php
index 852b8eef339a78c61a92d1261a7d30319e633533,721fbe6e9dfb5833b08b0e1d903e5471caa4c4d6..1a93086aea81cbb06af3bb907613a8f239957ec6
--- 1/boot.php
--- 2/boot.php
+++ b/boot.php
@@@ -12,9 -12,9 +12,9 @@@ require_once('library/Mobile_Detect/Mob
  require_once('include/features.php');
  
  define ( 'FRIENDICA_PLATFORM',     'Friendica');
 -define ( 'FRIENDICA_VERSION',      '3.1.1584' );
 +define ( 'FRIENDICA_VERSION',      '3.1.1586' );
  define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
- define ( 'DB_UPDATE_VERSION',      1157      );
+ define ( 'DB_UPDATE_VERSION',      1158      );
  
  define ( 'EOL',                    "<br />\r\n"     );
  define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );
@@@ -622,7 -622,6 +622,6 @@@ if(! class_exists('App')) 
                         */
                        if(!isset($this->page['htmlhead']))
                                $this->page['htmlhead'] = '';
-                       $tpl = get_markup_template('head.tpl');
  
                        // If we're using Smarty, then doing replace_macros() will replace
                        // any unrecognized variables with a blank string. Since we delay
@@@ -633,6 -632,7 +632,7 @@@
                        else
                                $stylesheet = '$stylesheet';
  
+                       $tpl = get_markup_template('head.tpl');
                        $this->page['htmlhead'] = replace_macros($tpl,array(
                                '$baseurl' => $this->get_baseurl(), // FIXME for z_path!!!!
                                '$local_user' => local_user(),
@@@ -1381,8 -1381,6 +1381,6 @@@ if(! function_exists('profile_sidebar')
                }
  
  
-               $tpl = get_markup_template('profile_vcard.tpl');
- 
                $p = array();
                foreach($profile as $k => $v) {
                        $k = str_replace('-','_',$k);
@@@ -1392,6 -1390,7 +1390,7 @@@
                if($a->theme['template_engine'] === 'internal')
                        $location = template_escape($location);
  
+               $tpl = get_markup_template('profile_vcard.tpl');
                $o .= replace_macros($tpl, array(
                        '$profile' => $p,
                        '$connect'  => $connect,

diff --combined mod/display.php
index 345b8e9f1e9e6c6b5757b55c9dad31185da75744,5c23559c5c7495482855037833570070ad445238..2ac1c369ebc33cc2852a25b6573d7fbe236e4ed4
--- 1/mod/display.php
--- 2/mod/display.php
+++ b/mod/display.php
@@@ -4,8 -4,6 +4,6 @@@
  function display_init(&$a) {
  
        if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
-               notice( t('Public access denied.') . EOL);
-               killme();
                return;
        }
  
@@@ -17,6 -15,11 +15,11 @@@
  
  function display_content(&$a, $update = 0) {
  
+       if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
+               notice( t('Public access denied.') . EOL);
+               return;
+       }
+ 
        require_once("include/bbcode.php");
        require_once('include/security.php');
        require_once('include/conversation.php');
@@@ -37,7 -40,6 +40,7 @@@
  
        if($update) {
                $item_id = $_REQUEST['item_id'];
 +              $a->profile = array('uid' => intval($update), 'profile_uid' => intval($update));
        }
        else {
                $item_id = (($a->argc > 2) ? intval($a->argv[2]) : 0);
@@@ -117,8 -119,6 +120,8 @@@
        $sql_extra = item_permissions_sql($a->profile['uid'],$remote_contact,$groups);
  
        if($update) {
 +
 +dbg(1);
                $r = q("SELECT id FROM item WHERE item.uid = %d
                        AND `item`.`parent` = ( SELECT `parent` FROM `item` WHERE ( `id` = '%s' OR `uri` = '%s' ))
                        $sql_extra AND unseen = 1",
@@@ -126,7 -126,6 +129,7 @@@
                        dbesc($item_id),
                        dbesc($item_id) 
                );
 +dbg(0);
                if(!$r)
                        return '';
        }