Merge commit 'origin/platal-0.9.17'

Conflicts:

	modules/marketing.php

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>

diff --git a/modules/marketing.php b/modules/marketing.php
index 77ee08d..11a34f9 100644 (file)
--- a/modules/marketing.php
+++ b/modules/marketing.php
@@ -267,7 +267,7 @@ class MarketingModule extends PLModule
             $page->assign('promo', $promo);
 
             if (Post::has('valide')) {
-                S::assert_xstf_token();
+                S::assert_xsrf_token();
                 $email = trim(Post::v('mail'));
 
                 if (!isvalid_email_redirection($email)) {

diff --git a/templates/include/plview.trombi.tpl b/templates/include/plview.trombi.tpl
index d0db912..e09cab6 100644 (file)
--- a/templates/include/plview.trombi.tpl
+++ b/templates/include/plview.trombi.tpl
@@ -26,8 +26,8 @@
 </p>
 {else}
 <table cellpadding="0" cellspacing="2" style="width: 100%">
-  {section name=trombi loop=$set start=1}
-  {if $smarty.section.trombi.iteration % 3 == 1}
+  {section name=trombi loop=$set start=0}
+  {if $smarty.section.trombi.index % 3 == 1}
   <tr>
     <td class="center" style="vertical-align: middle">
       <a href="{$mainsiteurl}profile/{$set[trombi.index_prev].forlife}" class="popup2">
@@ -75,7 +75,7 @@
     {/if}
     </td>
   </tr>
-  {elseif ($smarty.section.trombi.iteration % 3 == 0) && ($smarty.section.trombi.last)}
+  {elseif ($smarty.section.trombi.index % 3 == 0) && ($smarty.section.trombi.last)}
   <tr>
     <td class="center" style="vertical-align: middle; padding-bottom: 15px">
       <a href="{$mainsiteurl}profile/{$set[trombi].forlife}" class="popup2">