bitPickups/friendica_2021.01_tupambae_shared_hosting
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

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

Browse source 
Conflicts:
	boot.php
This commit is contained in:
Michael Vogel 2016-07-02 13:38:23 +02:00
commit 7d531afd00
10 changed files with 73 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

10
mod/message.php
View file

@ -9,7 +9,7 @@ function message_init(&$a) {
$tabs = '';
if ($a->argc >1 && is_numeric($a->argv[1])) {
$tabs = render_messages(get_messages(local_user(),0,5), 'mail_list.tpl');
$tabs = render_messages(get_messages(local_user(),0,5), 'mail_list.tpl');
}
$new = array(
@ -373,11 +373,13 @@ function message_content(&$a) {
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']);
if(! count($r)) {
if(! dba::is_result($r)) {
info( t('No messages.') . EOL);
return $o;
}
@ -562,7 +564,7 @@ function get_messages($user, $lstart, $lend) {
);
}
function render_messages($msg, $t) {
function render_messages(array $msg, $t) {
$a = get_app();