Merge branch 'master' of gitorious.org:statusnet/mainline into testing

1 files changed, 9 insertions, 0 deletions

diff --git a/lib/util.php b/lib/util.php
index 597da22c0..59d5132ec 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -1925,6 +1925,15 @@ function common_url_to_nickname($url)
             $path = preg_replace('@/$@', '', $parts['path']);
             $path = preg_replace('@^/@', '', $path);
             $path = basename($path);
+
+            // Hack for MediaWiki user pages, in the form:
+            // http://example.com/wiki/User:Myname
+            // ('User' may be localized.)
+            if (strpos($path, ':')) {
+                $parts = array_filter(explode(':', $path));
+                $path = $parts[count($parts) - 1];
+            }
+
             if ($path) {
                 return common_nicknamize($path);
             }