summaryrefslogtreecommitdiff
path: root/lib/util.php
diff options
context:
space:
mode:
authorJames Walker <walkah@walkah.net>2010-02-25 23:49:45 -0500
committerJames Walker <walkah@walkah.net>2010-02-25 23:49:45 -0500
commit7c8031dc4bf6ece83db893e13d89ced10c2f6b62 (patch)
tree9b48e3d511642450ac0566b00cfb6f2d8ae109aa /lib/util.php
parent855692141d531287b179841b8816e90023b6ba7b (diff)
parent02300ebfb08bfcd52f4ab34d1041455079ebf2ec (diff)
Merge remote branch 'statusnet/testing' into testing
Conflicts: plugins/OStatus/lib/webfinger.php
Diffstat (limited to 'lib/util.php')
-rw-r--r--lib/util.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/util.php b/lib/util.php
index d1c78f7d0..8381bc63c 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -1698,7 +1698,8 @@ function common_url_to_nickname($url)
# Strip starting, ending slashes
$path = preg_replace('@/$@', '', $parts['path']);
$path = preg_replace('@^/@', '', $path);
- if (strpos($path, '/') === false) {
+ $path = basename($path);
+ if ($path) {
return common_nicknamize($path);
}
}