Merge branch '3.8'

Conflicts:
	lib/classes/User/Adapter.php
	lib/conf.d/bases_structure.xml
This commit is contained in:
Romain Neutron
2013-12-20 09:53:09 +01:00
4 changed files with 2 additions and 64 deletions

View File

@@ -786,11 +786,6 @@ class User_Adapter implements User_Interface, cache_cacheableInterface
$stmt->execute([':usr_id' => $this->get_id()]);
$stmt->closeCursor();
$sql = 'DELETE FROM sselnew WHERE usr_id = :usr_id';
$stmt = $this->app['phraseanet.appbox']->get_connection()->prepare($sql);
$stmt->execute([':usr_id' => $this->get_id()]);
$stmt->closeCursor();
$sql = 'DELETE FROM tokens WHERE usr_id = :usr_id';
$stmt = $this->app['phraseanet.appbox']->get_connection()->prepare($sql);
$stmt->execute([':usr_id' => $this->get_id()]);