Merge remote-tracking branch 'upstream/develop' into 1502-contacts-in-scrape

diff --combined boot.php
index 503d0945d441f869b6958e49b3b090857a583cfb,0ab171d5f33182770dda5ea79b3aa43c5a370ebd..d2de87fc608024ba1f27c0e8cd8e50af379b3b90
--- 1/boot.php
--- 2/boot.php
+++ b/boot.php
@@@ -18,7 -18,7 +18,7 @@@ define ( 'FRIENDICA_PLATFORM',     'Fri
  define ( 'FRIENDICA_CODENAME',     'Ginger');
  define ( 'FRIENDICA_VERSION',      '3.3.3-RC' );
  define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
- define ( 'DB_UPDATE_VERSION',      1179      );
+ define ( 'DB_UPDATE_VERSION',      1180      );
  define ( 'EOL',                    "<br />\r\n"     );
  define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );
  
@@@ -1678,20 -1678,8 +1678,20 @@@ if(! function_exists('profile_sidebar')
  
                if (!$block){
                        $contact_block = contact_block();
 -              }
  
 +                      if(is_array($a->profile) AND !$a->profile['hide-friends']) {
 +                              $r = q("SELECT COUNT(*) AS `total` FROM `contact` WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 and `pending` = 0 AND `hidden` = 0 AND `archive` = 0
 +                                              AND `network` IN ('%s', '%s', '%s', '%s', '')",
 +                                      intval($profile['uid']),
 +                                      dbesc(NETWORK_DFRN),
 +                                      dbesc(NETWORK_DIASPORA),
 +                                      dbesc(NETWORK_OSTATUS),
 +                                      dbesc(NETWORK_STATUSNET)
 +                              );
 +                              if(count($r))
 +                                      $contacts = intval($r[0]['total']);
 +                      }
 +              }
  
                $p = array();
                foreach($profile as $k => $v) {
@@@ -1716,7 -1704,6 +1716,7 @@@
                        '$homepage' => $homepage,
                        '$about' => $about,
                        '$network' =>  t('Network:'),
 +                      '$contacts' => $contacts,
                        '$diaspora' => $diaspora,
                        '$contact_block' => $contact_block,
                ));

diff --combined view/templates/profile_vcard.tpl
index 097d44cc3bd5986fab090968ea5308d6cd95aac7,d5628115bf1a5de413cd01cd059d74e0e91c3107..08c7a77fb4ee41987edf1dd345c4890ad3f47cb2
--- 1/view/templates/profile_vcard.tpl
--- 2/view/templates/profile_vcard.tpl
+++ b/view/templates/profile_vcard.tpl
@@@ -8,9 -8,9 +8,9 @@@
        {{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
  
        {{if $profile.picdate}}
-               <div id="profile-photo-wrapper"><img class="photo u-photo" width="175" height="175" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></div>
+               <div id="profile-photo-wrapper"><a href="{{$profile.url}}"><img class="photo u-photo" width="175" height="175" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></a></div>
          {{else}}
-               <div id="profile-photo-wrapper"><img class="photo u-photo" width="175" height="175" src="{{$profile.photo}}" alt="{{$profile.name}}"></div>
+               <div id="profile-photo-wrapper"><a href="{{$profile.url}}"><img class="photo u-photo" width="175" height="175" src="{{$profile.photo}}" alt="{{$profile.name}}"></a></div>
          {{/if}}
        {{if $profile.network_name}}<dl class="network"><dt class="network-label">{{$network}}</dt><dd class="x-network">{{$profile.network_name}}</dd></dl>{{/if}}
        {{if $location}}
@@@ -31,8 -31,6 +31,8 @@@
        
        {{if $profile.pubkey}}<div class="key u-key" style="display:none;">{{$profile.pubkey}}</div>{{/if}}
  
 +      {{if $contacts}}<div class="contacts" style="display:none;">{{$contacts}}</div>{{/if}}
 +
        {{if $marital}}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>{{$marital}}</dt><dd class="marital-text">{{$profile.marital}}</dd></dl>{{/if}}
  
        {{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url u-url"><a href="{{$profile.homepage}}" rel="me" target="_blank">{{$profile.homepage}}</a></dd></dl>{{/if}}

diff --combined view/theme/vier/templates/profile_vcard.tpl
index ca5f44cf1ca5302a652893f832001ec72b70051e,03d4fb3a6f6a0a4e841baf436a3b00fc61e2743c..e00e68644ede345f14dd6785c515ea028aa00c41
--- 1/view/theme/vier/templates/profile_vcard.tpl
--- 2/view/theme/vier/templates/profile_vcard.tpl
+++ b/view/theme/vier/templates/profile_vcard.tpl
@@@ -15,9 -15,9 +15,9 @@@
  
  
        {{if $profile.picdate}}
-               <div id="profile-photo-wrapper"><img class="photo" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}" /></div>
+               <div id="profile-photo-wrapper"><a href="{{$profile.url}}"><img class="photo" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}" /></a></div>
        {{else}}
-               <div id="profile-photo-wrapper"><img class="photo" src="{{$profile.photo}}" alt="{{$profile.name}}" /></div>
+               <div id="profile-photo-wrapper"><a href="{{$profile.url}}"><img class="photo" src="{{$profile.photo}}" alt="{{$profile.name}}" /></a></div>
        {{/if}}
        {{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
  
@@@ -40,8 -40,6 +40,8 @@@
        
        {{if $profile.pubkey}}<div class="key" style="display:none;">{{$profile.pubkey}}</div>{{/if}}
  
 +      {{if $contacts}}<div class="contacts" style="display:none;">{{$contacts}}</div>{{/if}}
 +
        {{if $marital}}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>{{$marital}}</dt><dd class="marital-text">{{$profile.marital}}</dd></dl>{{/if}}
  
        {{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url"><a href="{{$profile.homepage}}" class="u-url" rel="me" target="_blank">{{$profile.homepage}}</a></dd></dl>{{/if}}