Skip to content

[13.x] Fixes merge conflict #55294

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Apr 7, 2025
Merged

[13.x] Fixes merge conflict #55294

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c61d4fc
[13.x] Fixes merge conflict
crynobone Apr 6, 2025
d26e077
Merge branch 'master' into 13/fix-tests
crynobone Apr 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/Illuminate/Database/Query/Builder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3354,6 +3354,8 @@ protected function enforceOrderBy()
*/
public function pluck($column, $key = null)
{
$original = $this->columns;

// First, we will need to select the results of the query accounting for the
// given columns / key. Once we have the results, we will be able to take
// the results and get the exact data that was requested for the query.
Expand Down
Loading