Revert "[5.2] Fix issue #11815"

laravel · May 26, 2016 · 5a2833a · 5a2833a
1 parent 0908679
commit 5a2833a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 18 deletions.
diff --git 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
@@ -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.
      *