diff options
| author | Friendika <info@friendika.com> | 2011-08-22 18:52:02 -0700 |
|---|---|---|
| committer | Friendika <info@friendika.com> | 2011-08-22 18:52:02 -0700 |
| commit | eb2ef6dec43391631e2989b55bc4d762336680ca (patch) | |
| tree | da2ffcc0410ac70ad82458a39245bdf89eb393a2 /include | |
| parent | 564ade0685470158ac487d9a9f18a21079c729bb (diff) | |
| download | volse-hubzilla-eb2ef6dec43391631e2989b55bc4d762336680ca.tar.gz volse-hubzilla-eb2ef6dec43391631e2989b55bc4d762336680ca.tar.bz2 volse-hubzilla-eb2ef6dec43391631e2989b55bc4d762336680ca.zip | |
diaspora admin toggle, update install guide
Diffstat (limited to 'include')
| -rw-r--r-- | include/acl_selectors.php | 2 | ||||
| -rw-r--r-- | include/network.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/acl_selectors.php b/include/acl_selectors.php index 48ba77a88..66fe104ea 100644 --- a/include/acl_selectors.php +++ b/include/acl_selectors.php @@ -170,7 +170,7 @@ function contact_select($selname, $selclass, $preselected = false, $size = 4, $p $sql_extra .= " AND `network` IN ( 'dfrn' ) "; } elseif($privatenet) { - $sql_extra .= " AND `network` IN ( 'dfrn', 'mail', 'face' ) "; + $sql_extra .= " AND `network` IN ( 'dfrn', 'mail', 'face', 'dspr' ) "; } diff --git a/include/network.php b/include/network.php index d4f0d8aa7..f0dd828d1 100644 --- a/include/network.php +++ b/include/network.php @@ -508,7 +508,7 @@ function fetch_xrd_links($url) { $xrd_timeout = intval(get_config('system','xrd_timeout')); $redirects = 0; - $xml = fetch_url($url,false,$redirects,(($xrd_timeout) ? $xrd_timeout : 30)); + $xml = fetch_url($url,false,$redirects,(($xrd_timeout) ? $xrd_timeout : 20)); logger('fetch_xrd_links: ' . $xml, LOGGER_DATA); |