Merge branch 'namecase' into 0.9.x

This commit is contained in:
Brion Vibber
2010-11-29 16:47:51 -08:00
18 changed files with 519 additions and 179 deletions

View File

@@ -67,10 +67,10 @@ class MapstractionPlugin extends Plugin
{
$m->connect(':nickname/all/map',
array('action' => 'allmap'),
array('nickname' => '['.NICKNAME_FMT.']{1,64}'));
array('nickname' => Nickname::DISPLAY_FMT));
$m->connect(':nickname/map',
array('action' => 'usermap'),
array('nickname' => '['.NICKNAME_FMT.']{1,64}'));
array('nickname' => Nickname::DISPLAY_FMT));
return true;
}

View File

@@ -53,7 +53,7 @@ class MapAction extends OwnerDesignAction
parent::prepare($args);
$nickname_arg = $this->arg('nickname');
$nickname = common_canonical_nickname($nickname_arg);
$nickname = Nickname::normalize($nickname_arg);
// Permanent redirect on non-canonical nickname