Skip to content

Commit 5015f48

Browse files
committed
Or to pipes
1 parent e1fdc58 commit 5015f48

1 file changed

Lines changed: 9 additions & 9 deletions

File tree

system/Database/BaseBuilder.php

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ public function select($select = '*', $escape = null)
258258
}
259259

260260
// If the escape value was not set, we will base it on the global setting
261-
is_bool($escape) OR $escape = $this->db->protectIdentifiers;
261+
is_bool($escape) || $escape = $this->db->protectIdentifiers;
262262

263263
foreach ($select as $val)
264264
{
@@ -360,7 +360,7 @@ public function selectSum($select = '', $alias = '')
360360
*/
361361
protected function maxMinAvgSum($select = '', $alias = '', $type = 'MAX')
362362
{
363-
if ( ! is_string($select) OR $select === '')
363+
if ( ! is_string($select) || $select === '')
364364
{
365365
throw new DatabaseException('The query you submitted is not valid.');
366366
}
@@ -505,7 +505,7 @@ public function join($table, $cond, $type = '', $escape = null)
505505
// in the protectIdentifiers to know whether to add a table prefix
506506
$this->trackAliases($table);
507507

508-
is_bool($escape) OR $escape = $this->db->protectIdentifiers;
508+
is_bool($escape) || $escape = $this->db->protectIdentifiers;
509509

510510
if ( ! $this->hasOperator($cond))
511511
{
@@ -625,7 +625,7 @@ protected function whereHaving($qb_key, $key, $value = null, $type = 'AND ', $es
625625
}
626626

627627
// If the escape value was not set will base it on the global setting
628-
is_bool($escape) OR $escape = $this->db->protectIdentifiers;
628+
is_bool($escape) || $escape = $this->db->protectIdentifiers;
629629

630630
foreach ($key as $k => $v)
631631
{
@@ -773,7 +773,7 @@ protected function _whereIn($key = null, $values = null, $not = false, $type = '
773773
$values = [$values];
774774
}
775775

776-
is_bool($escape) OR $escape = $this->db->protectIdentifiers;
776+
is_bool($escape) || $escape = $this->db->protectIdentifiers;
777777

778778
$ok = $key;
779779

@@ -1068,7 +1068,7 @@ protected function groupGetType($type)
10681068
*/
10691069
public function groupBy($by, $escape = null)
10701070
{
1071-
is_bool($escape) OR $escape = $this->db->protectIdentifiers;
1071+
is_bool($escape) || $escape = $this->db->protectIdentifiers;
10721072

10731073
if (is_string($by))
10741074
{
@@ -1161,7 +1161,7 @@ public function orderBy($orderby, $direction = '', $escape = null)
11611161
$direction = in_array($direction, ['ASC', 'DESC'], true) ? ' '.$direction : '';
11621162
}
11631163

1164-
is_bool($escape) OR $escape = $this->db->protectIdentifiers;
1164+
is_bool($escape) || $escape = $this->db->protectIdentifiers;
11651165

11661166
if ($escape === false)
11671167
{
@@ -2073,7 +2073,7 @@ public function setUpdateBatch($key, $index = '', $escape = null)
20732073
// @todo error
20742074
}
20752075

2076-
is_bool($escape) OR $escape = $this->db->protectIdentifiers;
2076+
is_bool($escape) || $escape = $this->db->protectIdentifiers;
20772077

20782078
foreach ($key as $k => $v)
20792079
{
@@ -2660,7 +2660,7 @@ protected function isLiteral($str)
26602660
{
26612661
$str = trim($str);
26622662

2663-
if (empty($str) OR ctype_digit($str) OR (string)(float)$str === $str OR
2663+
if (empty($str) || ctype_digit($str) || (string)(float)$str === $str ||
26642664
in_array(strtoupper($str), ['TRUE', 'FALSE'], true)
26652665
)
26662666
{

0 commit comments

Comments
 (0)