diff options
| -rw-r--r-- | boot.php | 2 | ||||
| -rw-r--r-- | include/network.php | 3 | ||||
| -rw-r--r-- | mod/register.php | 7 |
3 files changed, 10 insertions, 2 deletions
@@ -9,7 +9,7 @@ require_once('include/nav.php'); require_once('include/cache.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '2.3.1188' ); +define ( 'FRIENDICA_VERSION', '2.3.1190' ); define ( 'DFRN_PROTOCOL_VERSION', '2.22' ); define ( 'DB_UPDATE_VERSION', 1111 ); diff --git a/include/network.php b/include/network.php index 78ed24074..551d5e1d0 100644 --- a/include/network.php +++ b/include/network.php @@ -535,6 +535,9 @@ function fetch_xrd_links($url) { if ((! $xml) || (! stristr($xml,'<xrd'))) return array(); + // fix diaspora's bad xml + $xml = str_replace(array('href="','"/>'),array('href="','"/>'),$xml); + $h = parse_xml_string($xml); if(! $h) return array(); diff --git a/mod/register.php b/mod/register.php index 6ebe35dbf..0115ec0d5 100644 --- a/mod/register.php +++ b/mod/register.php @@ -452,7 +452,12 @@ function register_content(&$a) { $block = get_config('system','block_extended_register'); - if((($a->config['register_policy'] == REGISTER_CLOSED) && (! local_user())) || ($block)) { + if(local_user() && ($block)) { + notice("Permission denied." . EOL); + return; + } + + if((! local_user()) && ($a->config['register_policy'] == REGISTER_CLOSED)) { notice("Permission denied." . EOL); return; } |