From 5a2833a42a4ef703572754847217d2f3260f3306 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Thu, 26 May 2016 16:56:43 -0500 Subject: [PATCH] Revert "[5.2] Fix issue #11815" --- src/Illuminate/Database/Eloquent/Builder.php | 10 ++-------- src/Illuminate/Database/Eloquent/Model.php | 10 ---------- 2 files changed, 2 insertions(+), 18 deletions(-) diff --git a/src/Illuminate/Database/Eloquent/Builder.php b/src/Illuminate/Database/Eloquent/Builder.php index 67c13a366054..4664f6307f01 100755 --- a/src/Illuminate/Database/Eloquent/Builder.php +++ b/src/Illuminate/Database/Eloquent/Builder.php @@ -573,15 +573,9 @@ protected function addUpdatedAtColumn(array $values) return $values; } - if (count($this->getQuery()->joins) > 0) { - $column = $this->model->getQualifiedUpdatedAtColumn(); - } else { - $column = $this->model->getUpdatedAtColumn(); - } + $column = $this->model->getUpdatedAtColumn(); - return array_merge($values, [ - $column => $this->model->freshTimestampString(), - ]); + return Arr::add($values, $column, $this->model->freshTimestampString()); } /** diff --git a/src/Illuminate/Database/Eloquent/Model.php b/src/Illuminate/Database/Eloquent/Model.php index a7493a06c0ee..d7c7d0752e6f 100755 --- a/src/Illuminate/Database/Eloquent/Model.php +++ b/src/Illuminate/Database/Eloquent/Model.php @@ -1786,16 +1786,6 @@ public function getUpdatedAtColumn() return static::UPDATED_AT; } - /** - * Get the fully qualified "updated at" column. - * - * @return string - */ - public function getQualifiedUpdatedAtColumn() - { - return $this->getTable().'.'.$this->getUpdatedAtColumn(); - } - /** * Get a fresh timestamp for the model. *