mirror of
https://github.com/snipe/snipe-it.git
synced 2026-02-05 02:05:28 +00:00
conflict
This commit is contained in:
@ -920,14 +920,16 @@ class Helper
|
||||
} else {
|
||||
$required = false;
|
||||
}
|
||||
if (strpos($rule, 'required') === false) {
|
||||
return false;
|
||||
} else {
|
||||
if (strpos($rule_name, 'required') === false) {
|
||||
$required = false;
|
||||
} else {
|
||||
$required = true;
|
||||
}
|
||||
if (strpos($rule, 'required') === false) {
|
||||
return false;
|
||||
} else {
|
||||
if (strpos($rule_name, 'required') === false) {
|
||||
$required = false;
|
||||
} else {
|
||||
$required = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user