@bx80 opened this Pull Request on November 23rd 2022 Contributor

Description:

If the Archive::createDataTableFromArchive() method returns a DataTable\Map instead of a DataTable object then getCustomDimension() tries to use it as a single DataTable object resulting in errors. This fix checks if the returned object is a DataTable\Map and if so uses a different method to retrieve the required data.

Fixes #20043

Review

@justinvelluppillai commented on November 23rd 2022 Member

You can probably base this off 4.x-dev and aim for 4.13.0

@sgiehl commented on November 24th 2022 Member

@bx80 When changing the base branch of the PR, you need to rebase the branch on the new base branch. Merging this branch in won't remove all the additional commits from the original base. If you need help with that, let me know.

@bx80 commented on November 25th 2022 Contributor

@sgiehl Thanks, I've rebased the branch from 4.x-dev and force pushed the changes, it's still showing extra commits though. It's fairly painful to rebase 5.x-dev to 4.x-dev at the moment with the Angular removal changes. Might be cleaner if I just create a new branch / PR?

@sgiehl commented on November 25th 2022 Member

@bx80 rebasing should only be painful when you have dozens of merge conflicts. But in this case there shouldn't be any conflicts. So it should be a simple rebase on the branch, while removing all commits that don't belong to this PR...

@bx80 commented on November 28th 2022 Contributor

Thanks @sgiehl! :smiley: I was mistakenly attempting to merge in the other 5.x commits rather than just removing them :roll_eyes:

This Pull Request was closed on November 28th 2022
Powered by GitHub Issue Mirror