Just noting I've added this to the list of issues to consider for backporting.
Once enough votes have come in we'll be able to act upon this.

Aha my apologies, its being a while since I've dealt with a backport request.
This must wait at least three weeks before being backported Mark in order to let any regressions come to the surface in master.

I'm going to add the integration_held label to keep this out of our immediate queue and it will appear magically after that 3 week period on our dashboard.

Thanks Sam!

Not sure if we should backport this, since the patch has code style fixes and changes a few public apis.

Gets -1 from me.

I've not looked at this at all yet, but just seen Ankits comments whilst pulling into integration. Mark, you might want to eliminate the coding style fixes to increase your chances of success.

The integration team is considering this backport request right now. Stay tuned!

This backport request has been voted on by integrators, and we'd like to see it backported asap.

Thanks!

(sending this back to development, just in case there is anything to do, rebase, clean...)

Side note: In the review process if was commented that, perhaps, the webservice change should not be applied to stable branches. For your knowledge/consideration.

Hey Eloy, I have rebased this. I do not think it is an issue to include the web service changes in the stable branches. If the calendar type is not specified in the web service call then the default is chosen, so backwards compatibility isn't an issue afaics.

The main moodle.git repository has just been updated with latest weekly modifications. You may wish to rebase your PULL branches to simplify history and avoid any possible merge conflicts. This would also make integrator's life easier next week.

TIA and ciao

Moving this issue to current integration cycle, will be reviewed soon. Thanks for the hard work!

I just thought, what if the calendar type was specified in the web service BUT the site they were communicating with was using an older version of the stable branch which did not specify this variable? I am removing the changes in user/externallib.php to ensure this won't break the call.

Thanks Mark,

Looks perfect - I agree with not changing the web service (I think I raised it).

Integrated to 26 only.

Cheers!

Passing, thanks.

I claim to be a simple individual
liable to err like any other fellow mortal.
I own, however, that I have humility enough
to confess my errors and to retrace my steps.

Mahatma Gandhi

Your awesome code has met upstream, closing, thanks!

FYI, documented here http://docs.moodle.org/26/en/Calendar_settings