aboutsummaryrefslogtreecommitdiff
path: root/IkiWiki.pm
diff options
context:
space:
mode:
authorJoey Hess <joey@gnu.kitenet.net>2010-03-13 20:10:50 -0500
committerJoey Hess <joey@gnu.kitenet.net>2010-03-13 20:10:50 -0500
commitc0ad4929deb455804ddfc6451820c6c67a298ea1 (patch)
treecd19eca3ca1972958f609204509cc267d2b8c279 /IkiWiki.pm
parentfd43e83fcf7bf24493ecfff54111c1c5f1cab573 (diff)
downloadikiwiki-c0ad4929deb455804ddfc6451820c6c67a298ea1.tar
ikiwiki-c0ad4929deb455804ddfc6451820c6c67a298ea1.tar.gz
Improve openid url munging; do not display anchors and cgi parameters, as used by yahoo and google urls.
Diffstat (limited to 'IkiWiki.pm')
-rw-r--r--IkiWiki.pm2
1 files changed, 1 insertions, 1 deletions
diff --git a/IkiWiki.pm b/IkiWiki.pm
index 00eadfd98..251ed8cc8 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1131,7 +1131,7 @@ sub openiduser ($) {
# Convert "http://somehost.com/user" to "user [somehost.com]".
# (also "https://somehost.com/user/")
if ($display !~ /\[/) {
- $display=~s/^https?:\/\/(.+)\/([^\/]+)\/?$/$2 [$1]/;
+ $display=~s/^https?:\/\/(.+)\/([^\/#?]+)\/?(?:[#?].*)?$/$2 [$1]/;
}
$display=~s!^https?://!!; # make sure this is removed
eval q{use CGI 'escapeHTML'};