Merge commit 'origin/master' into fusionax

diff --git a/classes/xnetpage.php b/classes/xnetpage.php
index 77ca8cb..bebe4aa 100644 (file)
--- a/classes/xnetpage.php
+++ b/classes/xnetpage.php
@@ -41,6 +41,7 @@ class XnetPage extends PlPage
             $this->assign('is_admin', may_update());
             $this->assign('is_member', is_member());
         }
+        $this->addJsLink('xorg.js');
     }
 
     // }}}

diff --git a/classes/xorgpage.php b/classes/xorgpage.php
index f0d42ea..d2bb501 100644 (file)
--- a/classes/xorgpage.php
+++ b/classes/xorgpage.php
@@ -27,6 +27,7 @@ class XorgPage extends PlPage
 
         // Set the default page
         $this->changeTpl('platal/index.tpl');
+        $this->addJsLink('xorg.js');
     }
 
     public function run()

diff --git a/core b/core
index 1f16638..4e46552 160000 (submodule)
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit 1f16638f53b3521f838ce7cdb341c2332e4a046d
+Subproject commit 4e465523dbcaa0bae9cf0ab773617705884b2a8b

diff --git a/templates/lists/admin.tpl b/templates/lists/admin.tpl
index 9500d24..600d82a 100644 (file)
--- a/templates/lists/admin.tpl
+++ b/templates/lists/admin.tpl
@@ -120,7 +120,7 @@ emails de marketing. Une fois inscrits à Polytechnique.org, l'inscription à la
         {else}
         {$x.l}
         {/if}
-        <a href='{$platal->pl_self(1)}?del_owner={$x.l}'>{icon name=cross title='retirer modérateur'}</a>
+        <a href='{$platal->pl_self(1)}?del_owner={$x.l}&amp;token={xsrf_token}'>{icon name=cross title='retirer modérateur'}</a>
         <br />
         {/foreach}
       </td>