Merge branch 'testing' into 0.9.x

2010-05-21 13:15:08 -07:00
parent afd81a540a 87b8a89aa7
commit 6eae5d6a7e
16 changed files with 172 additions and 27 deletions
--- a/lib/util.php
+++ b/lib/util.php
@@ -1939,6 +1939,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);
            }