Item13897: Fixup's from merge

foswiki · Aug 11, 2016 · 3bc94ec · 3bc94ec
1 parent c4634d4
commit 3bc94ec
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/core/lib/Foswiki/App.pm b/core/lib/Foswiki/App.pm
@@ -1947,7 +1947,8 @@ sub getWikiName {
     my $cUID = $this->getCanonicalUserID($user);
     unless ( defined $cUID ) {
         my ( $w, $u ) =
-          normalizeWebTopicName( $this->cfg->data->{UsersWebName}, $user );
+          $this->request->normalizeWebTopicName(
+            $this->cfg->data->{UsersWebName}, $user );
         return $u;
     }
     return $this->users->getWikiName($cUID);
@@ -1972,7 +1973,8 @@ sub getWikiUserName {
     my $cUID = $this->getCanonicalUserID($user);
     unless ( defined $cUID ) {
         my ( $w, $u ) =
-          normalizeWebTopicName( $this->cfg->data->{UsersWebName}, $user );
+          $this->request->normalizeWebTopicName(
+            $this->cfg->data->{UsersWebName}, $user );
         return "$w.$u";
     }
     return $this->users->webDotWikiName($cUID);

diff --git a/core/lib/Foswiki/Config.pm b/core/lib/Foswiki/Config.pm
@@ -1677,6 +1677,8 @@ qr(AERO|ARPA|ASIA|BIZ|CAT|COM|COOP|EDU|GOV|INFO|INT|JOBS|MIL|MOBI|MUSEUM|NAME|NE
     $Foswiki::regex{filenameInvalidCharRegex} =
       qr/$Foswiki::cfg{AttachmentNameFilter}/;
 
+    $Foswiki::regex{webTopicInvalidCharRegex} = qr/$Foswiki::cfg{NameFilter}/;
+
     # Multi-character alpha-based regexes
     $Foswiki::regex{mixedAlphaNumRegex} = qr/[[:alnum:]]*/;