Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge 2.2 into 2.3 #10676

Merged
merged 9 commits into from
Dec 27, 2016
Merged

Merge 2.2 into 2.3 #10676

merged 9 commits into from
Dec 27, 2016

Conversation

mrclay
Copy link
Member

@mrclay mrclay commented Dec 27, 2016

No description provided.

iionly and others added 9 commits November 27, 2016 11:11
fix(core): Check existence of cache symlink without usage of readlink()
For string params, `serialize_parameters` outputs a string literal of PHP
code, and `addcslashes` was not appropriate for this task, particularly
around escapes in strings. While you can tell it to also escape escape
chars, a second pass would be needed.

The tests now `eval` the output just as the production code does, and
this also makes the tests easier to read.
fix(web_services): handle string params with proper escaping
The `elgg/Ajax` module was auto-converting any request with `options.data`
to use the `POST` method. This makes sense for things like actions, which
may send a large amount of form data, but it caused `$vars` to not be
populated as expected because only `GET` params are injected.

If you specified `options.data` with these methods before, note the server
will no longer receive this data as `$_POST` on the server.

Fixes Elgg#10667
Relative paths to files that contain special characters in the name
will now be encoded with base64 to avoid malformatted URLs and
HMAC mismatches resulting from unescaped characters.
URLs generated prior to this change will continue working.

Refs Elgg#10608
fix(files): mitigate issues with special chars in file names
fix(ajax): elgg/Ajax view() and form() set $vars as expected
@hypeJunction hypeJunction merged commit 9c9ce51 into Elgg:2.3 Dec 27, 2016
@mrclay mrclay deleted the merge_22 branch December 28, 2016 20:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants