Merge branch 'master' of github.com:thelia/thelia

2013-10-22 17:20:18 +02:00
parent 0580539ed8 0d242a4fc0
commit 2d987473b4
40 changed files with 390 additions and 297 deletions
--- a/core/lib/Thelia/Controller/Admin/BaseAdminController.php
+++ b/core/lib/Thelia/Controller/Admin/BaseAdminController.php
@@ -128,7 +128,7 @@ class BaseAdminController extends BaseController
         }

         // Log the problem
-         $this->adminLogAppend("User is not granted for permissions %s", implode(", ", $permArr));
+         $this->adminLogAppend("User is not granted for resources %s with accesses %s", implode(", ", $resources), implode(", ", $accesses));

         // Generate the proper response
         $response = new Response();