aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2015-03-09 16:25:55 -0700
committerfriendica <info@friendica.com>2015-03-09 16:27:12 -0700
commit26a414fe4b3ab4b1d995233f0402532ad41eaeb7 (patch)
tree40d65dbf107962f987d610a6ef7a16d930804762 /mod
parent97df5f1fd193aab92836ef3f9dd854406697b765 (diff)
downloadvolse-hubzilla-26a414fe4b3ab4b1d995233f0402532ad41eaeb7.tar.gz
volse-hubzilla-26a414fe4b3ab4b1d995233f0402532ad41eaeb7.tar.bz2
volse-hubzilla-26a414fe4b3ab4b1d995233f0402532ad41eaeb7.zip
make network page default options work more or less universally instead of just from the navbar, and fix some saved-search weirdness related to the delete-term icon
Diffstat (limited to 'mod')
-rw-r--r--mod/network.php11
1 files changed, 10 insertions, 1 deletions
diff --git a/mod/network.php b/mod/network.php
index 944c3c1d1..161b06804 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -13,6 +13,12 @@ function network_init(&$a) {
return;
}
+ if(count($_GET) < 2) {
+ $network_options = get_pconfig(local_channel(),'system','network_page_default');
+ if($network_options)
+ goaway('network' . '?f=&' . $network_options);
+ }
+
$channel = $a->get_channel();
$a->profile_uid = local_channel();
head_set_icon($channel['xchan_photo_s']);
@@ -369,10 +375,13 @@ function network_content(&$a, $update = 0, $load = false) {
// "New Item View" - show all items unthreaded in reverse created date order
$items = q("SELECT item.*, item.id AS item_id, received FROM item
+ left join abook on item.author_xchan = abook.abook_xchan
WHERE true $uids AND item_restrict = 0
+ and ((abook.abook_flags & %d) = 0 or abook.abook_flags is null)
$simple_update
$sql_extra $sql_nets
- ORDER BY item.received DESC $pager_sql "
+ ORDER BY item.received DESC $pager_sql ",
+ intval(ABOOK_FLAG_BLOCKED)
);
require_once('include/items.php');