Skip to content

Commit 9e3f6f4

Browse files
committed
Merge branch 'develop' into 7.x
# Conflicts: # src/Service/Action/Extension/Auth/UserFormattingExtension.php
2 parents 14cddbe + 8674c29 commit 9e3f6f4

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/Service/Action/Action.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ public function process()
230230
$event = new Event('Action.onAuth', $this, ['action' => $this]);
231231
$this->Auth->authCheck($event);
232232

233-
$event = $this->dispatchEvent('Action.beforeValidate', compact('data'));
233+
$event = $this->dispatchEvent('Action.beforeValidate', []);
234234

235235
if ($event->isStopped()) {
236236
$this->dispatchEvent('Action.beforeValidateStopped', []);
@@ -243,7 +243,7 @@ public function process()
243243
throw new ValidationException(__('Validation failed'), 0, null, []);
244244
}
245245

246-
$event = $this->dispatchEvent('Action.beforeExecute', compact('data'));
246+
$event = $this->dispatchEvent('Action.beforeExecute', []);
247247

248248
if ($event->isStopped()) {
249249
$this->dispatchEvent('Action.beforeExecuteStopped', []);

0 commit comments

Comments
 (0)