Merge branch 'cleanmaster' into modules

Conflicts:
	core/lib/Thelia/Tests/Action/RewrittenUrlTestTrait.php
This commit is contained in:
Etienne Roudeix
2013-12-16 09:57:35 +01:00
14 changed files with 46 additions and 18 deletions

View File

@@ -18,7 +18,7 @@ class AdminLog extends BaseAdminLog
* @param Request $request
* @param Base\Admin $adminUser
*/
public static function append($resource, $action, $message, Request $request, BaseAdminUser $adminUser = null) {
public static function append($resource, $action, $message, Request $request, BaseAdminUser $adminUser = null, $withRequestContent = true) {
$log = new AdminLog();
@@ -29,7 +29,7 @@ class AdminLog extends BaseAdminLog
->setResource($resource)
->setAction($action)
->setMessage($message)
->setRequest($request->__toString())
->setRequest($request->toString($withRequestContent))
;
try {