mirror of
https://github.com/snipe/snipe-it.git
synced 2024-12-25 05:34:06 -08:00
conflict
This commit is contained in:
parent
bc417308c7
commit
090a595c99
|
@ -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;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue