Moves make_username to PlUser.
authorStéphane Jacob <sj@m4x.org>
Mon, 22 Feb 2010 12:49:16 +0000 (13:49 +0100)
committerStéphane Jacob <sj@m4x.org>
Mon, 22 Feb 2010 14:24:03 +0000 (15:24 +0100)
Signed-off-by: Stéphane Jacob <sj@m4x.org>
core
include/name.func.inc.php
modules/register/register.inc.php

diff --git a/core b/core
index fc2cfa6..2a683f7 160000 (submodule)
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit fc2cfa65c5e0d22fb1711827009064bc1909c1c6
+Subproject commit 2a683f7ff213da0d2a2fdd26f88b2025394c91d6
index f1f3f68..745dfa6 100644 (file)
@@ -173,7 +173,7 @@ function build_short_name(&$search_names, &$sn_types, &$alias = null)
         $firstname = $search_names[$sn_types['firstname']]['fullname'];
     }
     if ($alias) {
-        $alias = make_username($firstname, $lastname);
+        $alias = PlUser::makeUserName($firstname, $lastname);
     }
     return $firstname . " " . $lastname;
 }
index 0763057..9b35993 100644 (file)
@@ -153,7 +153,7 @@ function create_aliases (&$sub)
     global $globals;
     extract ($sub);
 
-    $mailorg = make_username($prenom, $nom);
+    $mailorg = makeUsername($prenom, $nom);
     $mailorg2 = $mailorg.sprintf(".%02u", ($promo%100));
 
     $res = XDB::query("SELECT hruid FROM auth_user_md5 WHERE user_id = {?} AND hruid != ''", $uid);