diff options
| author | Evan Prodromou <evan@status.net> | 2010-02-25 19:59:01 -0500 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2010-02-25 19:59:01 -0500 |
| commit | 1cae324555a7eaddfc7238fd6670351898944c7c (patch) | |
| tree | d1c3af3a40b9ff36d4276907a042f0585887b0f0 /lib/util.php | |
| parent | 894b221e8aec57768d6804ee3bf53c85196e09bf (diff) | |
| parent | 82cac2be595953029e61f2e6f21122206b82314e (diff) | |
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
Diffstat (limited to 'lib/util.php')
| -rw-r--r-- | lib/util.php | 3 |
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); } } |