Merge remote branch 'origin/xorg/maint' into xorg/master

diff --git a/modules/admin.php b/modules/admin.php
index d96446d..34c3f44 100644 (file)
--- a/modules/admin.php
+++ b/modules/admin.php
@@ -846,7 +846,7 @@ class AdminModule extends PLModule
                     $grad_year = $promotion;
                     $entry_year = $promotion - 3;
                     $promo = 'D (en cours)';
-                    $hrpromo = $promo;
+                    $hrpromo = 'D' . $promotion;
                     $type = 'phd';
                     break;
                   default: