Merge https://github.com/redmatrix/hubzilla into pending_merge

2 files changed, 2 insertions, 2 deletions

diff --git a/doc/hidden_configs.bb b/doc/hidden_configs.bb
index dc9780aad..f92f23f59 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]
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'])
 		);