Fix for issue 2685

[sadashivdalvi]

Issue is reported at https://lab.civicrm.org/dev/core/-/issues/2685

[civicrm-builder]

Can one of the admins verify this patch?

[civibot]

(Standard links)

• If this is your first pull-request for CiviCRM, please browse CONTRIBUTING.md for information about the development and testing processes.
• If you are reviewing this pull-request, you may wish to consult the test sites and the Review Standards (long template, short template).

[seamuslee001]

Jenkins ok to test

[seamuslee001]

@eileenmcnaughton this I think is a possible intra regression from your $ids work

[eileenmcnaughton]

Yeah dang - I thought I could switch it to the rc as we should merge to the 5.40 branch but it is NOT clean - @sadashivdalvi are you able to rebase over the 5.40 branch and force push (probably easiest is to git reset --hard origin/5.40 & then just cherry-pick your patch back on - then us -f when pushing to github)

[sadashivdalvi]

ok, will rebase over 5.40 and apply this on it. Should I then create a PR from there and we close this PR?

[seamuslee001]

@sadashivdalvi if you force push onto this current branch it you shouldn't need to re-create the PR

[sadashivdalvi]

ok, I did rebase and force push, now you can check and merge.

Thanks,
Sadashiv