closes 358

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

diff --git a/ChangeLog b/ChangeLog
index 5310cf8..c652757 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -39,6 +39,7 @@ Bug/Wish :
         - #335: Already assigned promotion don't generate a request.        -CAT
         - #346: Professional profile code desynch. fixed.                   -MC
         - #357: Reindex user for fast search at subscribe time.             -MC
+        - #358: Avoid duplicate email address when bestalias = 4life.       -MC
 
     * Xnet :
         - #334: Interface improvements.                                     -Car

diff --git a/templates/fiche.tpl b/templates/fiche.tpl
index 3d1126d..26865cb 100644 (file)
--- a/templates/fiche.tpl
+++ b/templates/fiche.tpl
@@ -23,7 +23,11 @@
 {literal}
 <script type="text/javascript">
 function chgMainWinLoc( strPage ) {
-  parent.opener.document.location = strPage;
+  if (parent.opener) {
+    parent.opener.document.location = strPage;
+  } else {
+    document.location = strPage;
+  }
 }
 </script>
 {/literal}
@@ -74,7 +78,7 @@ function chgMainWinLoc( strPage ) {
           <a href="mailto:{$virtualalias}">{$virtualalias}</a><br />
           {/if}
           <a href="mailto:{$x.bestalias}@polytechnique.org">{$x.bestalias}@polytechnique.org</a>
-          {if $bestalias neq $x.forlife}<br />
+          {if $x.bestalias neq $x.forlife}<br />
           <a href="mailto:{$x.forlife}@polytechnique.org">{$x.forlife}@polytechnique.org</a>
           {/if}
           {/if}