Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-12-23 16:00:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Some fixes:

Browse source 
- avoids warning if no result is coming back
- brought back init variable before using it

Signed-off-by: Roland Haeder <roland@mxchange.org>
This commit is contained in:
Roland Haeder 2016-09-18 23:34:50 +02:00
parent 636164e9ef
commit e171a1cd22
No known key found for this signature in database
GPG key ID: B72F8185C6C7BD78
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mod/dfrn_request.php
View file

@ -732,6 +732,8 @@ function dfrn_request_content(&$a) {
intval($intro[0]['contact-id']) intval($intro[0]['contact-id'])
); );
$auto_confirm = false;
if(dbm::is_result($r)) { if(dbm::is_result($r)) {
if(($r[0]['page-flags'] != PAGE_NORMAL) && ($r[0]['page-flags'] != PAGE_PRVGROUP)) if(($r[0]['page-flags'] != PAGE_NORMAL) && ($r[0]['page-flags'] != PAGE_PRVGROUP))
$auto_confirm = true; $auto_confirm = true;

4
mod/network.php
View file

@ -728,7 +728,9 @@ function network_content(&$a, $update = 0) {
intval($parents), intval($parents),
intval($max_comments + 1) intval($max_comments + 1)
); );
$items = array_merge($items, $thread_items);
if (dbm::is_result($thread_items))
$items = array_merge($items, $thread_items);
} }
$items = conv_sort($items,$ordering); $items = conv_sort($items,$ordering);
} else { } else {