aboutsummaryrefslogtreecommitdiffstats
path: root/include/network.php
diff options
context:
space:
mode:
authorMichael <icarus@dabo.de>2012-02-19 20:09:42 +0100
committerMichael <icarus@dabo.de>2012-02-19 20:09:42 +0100
commitcafd4003522a472d2709569ea5eb5f80b817af23 (patch)
treebbd512126515afc929de06dce79ba847b9681092 /include/network.php
parent73e0e4d78341cb96ef9665a0ee4fb7e7ee2a701f (diff)
parenta9ed5915cebcf51347acaad51d0c252e57bceaff (diff)
downloadvolse-hubzilla-cafd4003522a472d2709569ea5eb5f80b817af23.tar.gz
volse-hubzilla-cafd4003522a472d2709569ea5eb5f80b817af23.tar.bz2
volse-hubzilla-cafd4003522a472d2709569ea5eb5f80b817af23.zip
Merge remote branch 'upstream/master'
Conflicts: view/theme/vier/style.css
Diffstat (limited to 'include/network.php')
-rwxr-xr-xinclude/network.php3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/network.php b/include/network.php
index 551d5e1d0..25db62d16 100755
--- a/include/network.php
+++ b/include/network.php
@@ -579,6 +579,9 @@ function fetch_xrd_links($url) {
if(! function_exists('validate_url')) {
function validate_url(&$url) {
+ // no naked subdomains
+ if(strpos($url,'.') === false)
+ return false;
if(substr($url,0,4) != 'http')
$url = 'http://' . $url;
$h = @parse_url($url);