Code style errors in Functions.php

[jcogs-design]

Description of the problem
While working on #441 I noticed two coding errors flagged up in public function prep_conditionals which is found elsewhere in the Functions.php code.

The first is an attempt to merge a string variable into an array value:

ExpressionEngine/system/ee/legacy/libraries/Functions.php

Line 1722 in 5db58a8

$vars = array_merge($vars, ee()->TMPL->embed_vars);

The second is an attempt to return a value ($prepped_string) that is not defined

ExpressionEngine/system/ee/legacy/libraries/Functions.php

Line 1779 in 5db58a8

return $prepped_string;

Both appear to be code that hasn't been touched in over 6 years, so presumably neither are causing problems, but maybe should be fixed at some point.

How To Reproduce
Errors are in the code.

Error Messages
n/a

Screenshots / Videos / Template Code
n/a

Environment Details:

• Version: [5.3.2]

Possible Solution
I'm not sure what use is made of this function. A decision on how to proceed depends on knowing whether it is used, and what actual function is required from these two lines of code. Once this established, fix should be apparent.

Additional context

[intoeetive]

For 1st one, looking at function calls I think both variables are arrays, but $vars is mistakenly desribed as string in function's comment.
2nd one is not really an issue because the code execution never gets there. It likely needs to be removed however.

So the fix would really be more "cosmetical" type of thing, this is not code error as such