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

@@ -168,7 +168,6 @@ class UserManager
{
foreach ([
'DELETE FROM `edit_presets` WHERE usr_id = :usr_id',
'DELETE FROM `sselnew` WHERE usr_id = :usr_id',
'DELETE FROM `tokens` WHERE usr_id = :usr_id',
] as $sql) {
$stmt = $this->appboxConnection->prepare($sql);