From 6ec021aafabb2d01d1965ab763aad5435251958a Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Mon, 2 Nov 2015 08:36:43 +0100 Subject: [PATCH 1/2] revert filtering by metwork --- mod/connedit.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/connedit.php b/mod/connedit.php index 87ca55703..877c12dc7 100644 --- a/mod/connedit.php +++ b/mod/connedit.php @@ -655,7 +655,7 @@ function connedit_content(&$a) { $locstr = ''; $locs = q("select hubloc_addr as location from hubloc left join site on hubloc_url = site_url where hubloc_hash = '%s' - and hubloc_network = 'zot' and hubloc_deleted = 0 and site_dead = 0", + and hubloc_deleted = 0 and site_dead = 0", dbesc($contact['xchan_hash']) ); From 54eae7830eb37a55d358ac23768d700babc4b14c Mon Sep 17 00:00:00 2001 From: ken restivo Date: Mon, 2 Nov 2015 12:52:23 -0800 Subject: [PATCH 2/2] Update RSS setting docs. --- doc/hidden_configs.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/hidden_configs.bb b/doc/hidden_configs.bb index 76213851c..554eb55de 100644 --- a/doc/hidden_configs.bb +++ b/doc/hidden_configs.bb @@ -112,7 +112,7 @@ This document assumes you're an administrator. [b]system > cron_hour[/b] Specify an hour in which to run cron_daily. By default with no config, this will run at midnight UTC. [b]system > minimum_feedcheck_minutes[/b] - The minimum interval between polling RSS feeds. If this is lower than the cron interval, feeds will be polled with each cronjob + The minimum interval between polling RSS feeds. If this is lower than the cron interval, feeds will be polled with each cronjob. Defaults to 60 if not set. The site setting can also be over-ridden on a channel by channel basis by a service class setting aptly named 'minimum_feedcheck_minutes'. [b]system > blacklisted_sites[/b] An array of specific hubs to block from this hub completely. [b]system > ignore_imagick[/b]