Backport

git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@981 839d8a87-29fc-0310-9880-83ba4fa771e5

diff --git a/ChangeLog b/ChangeLog
index 9a6d096..424f4e5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -36,6 +36,7 @@ From 0.9.11 branch:
 
     * Profile:
         - #486: fix force login to see private fiche.                      -Car
+        - #509: can access trombi of the current year promotion            -FRU
 
 ================================================================================
 VERSION 0.9.11                                                 18 Septembre 2006

diff --git a/modules/profile.php b/modules/profile.php
index aa518a0..6e027b4 100644 (file)
--- a/modules/profile.php
+++ b/modules/profile.php
@@ -647,7 +647,7 @@ class ProfileModule extends PLModule
 
         $this->promo = $promo = intval($promo);
 
-        if ($promo >= 1900 && $promo < intval(date('Y'))
+        if ($promo >= 1900 && ($promo < intval(date('Y')) || ($promo == intval(date('Y')) && intval(date('m')) >= 9))
         || ($promo == -1 && S::has_perms()))
         {
             $trombi = new Trombi(array($this, '_trombi_getlist'));