[13.x] Fixes merge conflict (#55294)

crynobone · web-flow · commit cb3f391f4989 · 2025-04-07T09:51:22.000-05:00
Signed-off-by: Mior Muhammad Zaki &lt;crynobone@gmail.com&gt;
diff --git a/src/Illuminate/Database/Query/Builder.php b/src/Illuminate/Database/Query/Builder.php
@@ -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.

Original file line number	Diff line number	Diff line change
`@@ -3354,6 +3354,8 @@ protected function enforceOrderBy()`
`3354`	`3354`	`*/`
`3355`	`3355`	`public function pluck($column, $key = null)`
`3356`	`3356`	`{`
	`3357`	`+ $original = $this->columns;`
	`3358`	`+`
`3357`	`3359`	`// First, we will need to select the results of the query accounting for the`
`3358`	`3360`	`// given columns / key. Once we have the results, we will be able to take`
`3359`	`3361`	`// the results and get the exact data that was requested for the query.`