From: Stéphane Jacob Date: Mon, 22 Feb 2010 12:49:16 +0000 (+0100) Subject: Moves make_username to PlUser. X-Git-Tag: xorg/1.0.0~332^2~180 X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=e788e5a2cbf05049a3a52e44c69e2c4c3422d929;p=platal.git Moves make_username to PlUser. Signed-off-by: Stéphane Jacob --- diff --git a/core b/core index fc2cfa6..2a683f7 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit fc2cfa65c5e0d22fb1711827009064bc1909c1c6 +Subproject commit 2a683f7ff213da0d2a2fdd26f88b2025394c91d6 diff --git a/include/name.func.inc.php b/include/name.func.inc.php index f1f3f68..745dfa6 100644 --- a/include/name.func.inc.php +++ b/include/name.func.inc.php @@ -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; } diff --git a/modules/register/register.inc.php b/modules/register/register.inc.php index 0763057..9b35993 100644 --- a/modules/register/register.inc.php +++ b/modules/register/register.inc.php @@ -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);