Merge branch 'cleanmaster' into modules

Conflicts: core/lib/Thelia/Tests/Action/RewrittenUrlTestTrait.php
2013-12-16 09:57:35 +01:00
parent 76cd704f80 0e30ce2760
commit 536c88b4f8
14 changed files with 46 additions and 18 deletions
--- a/core/lib/Thelia/Controller/Admin/SessionController.php
+++ b/core/lib/Thelia/Controller/Admin/SessionController.php
@@ -99,7 +99,7 @@ class SessionController extends BaseAdminController
            $this->getSecurityContext()->setAdminUser($user);

            // Log authentication success
-            AdminLog::append("admin", "LOGIN", "Authentication successful", $request, $user);
+            AdminLog::append("admin", "LOGIN", "Authentication successful", $request, $user, false);

            /**
             * FIXME: we have tou find a way to send cookie