friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Reformatted stuff, improved query

This commit is contained in:
Michael 2017-01-24 06:45:46 +00:00
parent be1db7bdb0
commit ea18d1829f
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/contact_widgets.php
View File

@ -90,7 +90,7 @@ function networks_widget($baseurl,$selected = '') {
$extra_sql = unavailable_networks(); $extra_sql = unavailable_networks();
$r = q("SELECT DISTINCT(`network`) FROM `contact` WHERE `uid` = %d AND NOT `self` $extra_sql ORDER BY `network`", $r = q("SELECT DISTINCT(`network`) FROM `contact` WHERE `uid` = %d AND `network` != '' $extra_sql ORDER BY `network`",
intval(local_user()) intval(local_user())
); );

16
mod/network.php
View File

@ -773,14 +773,12 @@ function network_content(App $a, $update = 0) {
intval(local_user()) intval(local_user())
); );
} }
} else { } elseif ($update_unseen) {
if ($update_unseen) {
$unseen = q("SELECT `id` FROM `item` ".$update_unseen. " LIMIT 1"); $unseen = q("SELECT `id` FROM `item` ".$update_unseen. " LIMIT 1");
if (dbm::is_result($unseen)) { if (dbm::is_result($unseen)) {
$r = q("UPDATE `item` SET `unseen` = 0 $update_unseen"); $r = q("UPDATE `item` SET `unseen` = 0 $update_unseen");
}
} }
} }
@ -791,10 +789,10 @@ function network_content(App $a, $update = 0) {
$o .= conversation($a,$items,$mode,$update); $o .= conversation($a,$items,$mode,$update);
if(!$update) { if (!$update) {
if(get_pconfig(local_user(),'system','infinite_scroll')) { if (get_pconfig(local_user(),'system','infinite_scroll')) {
$o .= scroll_loader(); $o .= scroll_loader();
} elseif(!get_config('system', 'old_pager')) { } elseif (!get_config('system', 'old_pager')) {
$o .= alt_pager($a,count($items)); $o .= alt_pager($a,count($items));
} else { } else {
$o .= paginate($a); $o .= paginate($a);