Merge branch 'rewrites/is_filled_array_introduced' of git://github.com/Quix0r/friendi...

Conflicts:
	boot.php

diff --cc boot.php
index 4276784,a9ff0c3..e1c7f6b
--- 1/boot.php
--- 2/boot.php
+++ b/boot.php
@@@ -1901,6 -1888,32 +1901,31 @@@ function is_site_admin() 
        return false;
  }
  
 -
+ function load_contact_links($uid) {
+ 
+       $a = get_app();
+ 
+       $ret = array();
+ 
+       if(! $uid || x($a->contacts,'empty'))
+               return;
+ 
+       $r = q("SELECT `id`,`network`,`url`,`thumb`, `rel` FROM `contact` WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 AND `thumb` != ''",
+                       intval($uid)
+       );
+ 
+       if(dba::is_result($r)) {
+               foreach($r as $rr){
+                       $url = normalise_link($rr['url']);
+                       $ret[$url] = $rr;
+               }
+       } else
+               $ret['empty'] = true;
+ 
+       $a->contacts = $ret;
+       return;
+ }
+ 
  /**
   * @brief Returns querystring as string from a mapped array.
   *

diff --cc include/ForumManager.php
Simple merge

diff --cc include/poller.php
Simple merge

diff --cc index.php
Simple merge

diff --cc mod/message.php
index ef5dce8,b6981cc..b08ab20
--- 1/mod/message.php
--- 2/mod/message.php
+++ b/mod/message.php
@@@ -370,10 -356,13 +370,12 @@@ function message_content(&$a) 
  
                $r = q("SELECT count(*) AS `total` FROM `mail`
                        WHERE `mail`.`uid` = %d GROUP BY `parent-uri` ORDER BY `created` DESC",
 -                      intval(local_user()),
 -                      dbesc($myprofile)
 +                      intval(local_user())
                );
  
-               if(count($r)) $a->set_pager_total($r[0]['total']);
+               if (dba::is_result($r)) {
+                       $a->set_pager_total($r[0]['total']);
+               }
  
                $r = get_messages(local_user(), $a->pager['start'], $a->pager['itemspage']);
  

diff --cc mod/network.php
Simple merge

diff --cc mod/ping.php
Simple merge

diff --cc mod/profile.php
Simple merge