Merge branch 'platal-0.9.17'
authorVincent Zanotti <vincent.zanotti@polytechnique.org>
Mon, 30 Jun 2008 00:35:55 +0000 (02:35 +0200)
committerVincent Zanotti <vincent.zanotti@polytechnique.org>
Mon, 30 Jun 2008 00:35:55 +0000 (02:35 +0200)
Signed-off-by: Vincent Zanotti <vincent.zanotti@polytechnique.org>
1  2 
classes/xnetpage.php
include/user.func.inc.php
modules/lists.php
modules/profile.php
modules/xnetgrp.php

Simple merge
Simple merge
Simple merge
@@@ -159,8 -164,10 +165,10 @@@ class ProfileModule extends PLModul
              XDB::execute('DELETE FROM  requests
                                  WHERE  user_id = {?} AND type="photo"',
                           S::v('uid'));
 -            update_NbValid();
 +            $globals->updateNbValid();
          } elseif (Env::v('cancel')) {
+             S::assert_xsrf_token();
              $sql = XDB::query('DELETE FROM  requests
                                       WHERE  user_id={?} AND type="photo"',
                                S::v('uid'));
Simple merge