Skip to content

Commit e5042e1

Browse files
committed
fix orWhere
1 parent a432d9e commit e5042e1

2 files changed

Lines changed: 9 additions & 1 deletion

File tree

src/Illuminate/Database/Eloquent/Builder.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -241,6 +241,10 @@ public function where($column, $operator = null, $value = null, $boolean = 'and'
241241
*/
242242
public function orWhere($column, $operator = null, $value = null)
243243
{
244+
list($value, $operator) = $this->query->prepareValueAndOperator(
245+
$value, $operator, func_num_args() == 2
246+
);
247+
244248
return $this->where($column, $operator, $value, 'or');
245249
}
246250

src/Illuminate/Database/Query/Builder.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -583,7 +583,7 @@ protected function addArrayOfWheres($column, $boolean, $method = 'where')
583583
*
584584
* @throws \InvalidArgumentException
585585
*/
586-
protected function prepareValueAndOperator($value, $operator, $useDefault = false)
586+
public function prepareValueAndOperator($value, $operator, $useDefault = false)
587587
{
588588
if ($useDefault) {
589589
return [$operator, '='];
@@ -631,6 +631,10 @@ protected function invalidOperator($operator)
631631
*/
632632
public function orWhere($column, $operator = null, $value = null)
633633
{
634+
list($value, $operator) = $this->prepareValueAndOperator(
635+
$value, $operator, func_num_args() == 2
636+
);
637+
634638
return $this->where($column, $operator, $value, 'or');
635639
}
636640

0 commit comments

Comments
 (0)