Merge pull request #52241 from Rubonnek/fix-simplify-path-ret

[3.x] Fix `String::simplify_path` return type
This commit is contained in:
Hugo Locurcio 2021-09-03 15:49:53 +02:00 committed by GitHub
commit ef1c509372
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions

View file

@ -1688,7 +1688,7 @@ void register_variant_methods() {
ADDFUNC0R(STRING, BOOL, String, empty, varray());
ADDFUNC1R(STRING, STRING, String, humanize_size, INT, "size", varray());
ADDFUNC0R(STRING, BOOL, String, is_abs_path, varray());
ADDFUNC0R(STRING, BOOL, String, simplify_path, varray());
ADDFUNC0R(STRING, STRING, String, simplify_path, varray());
ADDFUNC0R(STRING, BOOL, String, is_rel_path, varray());
ADDFUNC0R(STRING, STRING, String, get_base_dir, varray());
ADDFUNC0R(STRING, STRING, String, get_file, varray());

View file

@ -667,7 +667,7 @@
</description>
</method>
<method name="simplify_path">
<return type="bool" />
<return type="String" />
<description>
Returns a simplified canonical path.
</description>