Skip to content

Commit bea3042

Browse files
authored
Merge pull request #4540 from Laravel-Backpack/add-is-string-check-for-invokable-class
[BUG] add more checks, change execution order in strippedRequest
2 parents 3f6f840 + c309817 commit bea3042

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

src/app/Library/CrudPanel/Traits/Fields.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -479,19 +479,19 @@ public function getStrippedSaveRequest($request)
479479
{
480480
$setting = $this->getOperationSetting('strippedRequest');
481481

482+
// if a closure was passed
483+
if (is_callable($setting)) {
484+
return $setting($request);
485+
}
486+
482487
// if an invokable class was passed
483488
// eg. \App\Http\Requests\BackpackStrippedRequest
484-
if (class_exists($setting)) {
489+
if (is_string($setting) && class_exists($setting)) {
485490
$setting = new $setting();
486491

487492
return is_callable($setting) ? $setting($request) : abort(500, get_class($setting).' is not invokable.');
488493
}
489494

490-
// if a closure was passed
491-
if (is_callable($setting)) {
492-
return $setting($request);
493-
}
494-
495495
return $request->only($this->getAllFieldNames());
496496
}
497497

0 commit comments

Comments
 (0)