X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fnetwork.php;h=624169511a06a5c6e702bf4a37dcd6367a9df1ec;hb=ed6ca1d3845070decc732ce5df266b49b448b940;hp=ba7bff791aefb66d9fea45c0fc98dd874bc950a2;hpb=dbf51229d9014089eba0da41a55f23c507f7e2ea;p=friendica.git diff --git a/mod/network.php b/mod/network.php index ba7bff791a..624169511a 100644 --- a/mod/network.php +++ b/mod/network.php @@ -594,7 +594,7 @@ function network_content(&$a, $update = 0) { if($update) killme(); notice( t('No such group') . EOL ); - goaway($a->get_baseurl(true) . '/network'); + goaway($a->get_baseurl(true) . '/network/0'); // NOTREACHED } @@ -740,8 +740,17 @@ function network_content(&$a, $update = 0) { } } - $itemspage_network = get_pconfig(local_user(),'system','itemspage_network'); - $itemspage_network = ((intval($itemspage_network)) ? $itemspage_network : 40); + // check if we serve a mobile device and get the user settings + // accordingly + if ($a->is_mobile) { + $itemspage_network = get_pconfig(local_user(),'system','itemspage_mobile_network'); + $itemspage_network = ((intval($itemspage_network)) ? $itemspage_network : 20); + } else { + $itemspage_network = get_pconfig(local_user(),'system','itemspage_network'); + $itemspage_network = ((intval($itemspage_network)) ? $itemspage_network : 40); + } + // now that we have the user settings, see if the theme forces + // a maximum item number which is lower then the user choice if(($a->force_max_items > 0) && ($a->force_max_items < $itemspage_network)) $itemspage_network = $a->force_max_items;