From: Michael Vogel <icarus@dabo.de>
Date: Sat, 2 Jul 2016 11:38:23 +0000 (+0200)
Subject: Merge branch 'rewrites/is_filled_array_introduced' of git://github.com/Quix0r/friendi... 
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=7d531afd00de35ef55d0cc5caa63242765341dae;p=friendica.git

Merge branch 'rewrites/is_filled_array_introduced' of git://github.com/Quix0r/friendica into Quix0r-rewrites/is_filled_array_introduced

Conflicts:
	boot.php
---

7d531afd00de35ef55d0cc5caa63242765341dae
diff --cc boot.php
index 42767845c2,a9ff0c30c3..e1c7f6b119
--- a/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 mod/message.php
index ef5dce826e,b6981cc88c..b08ab200ec
--- a/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']);