From 8e6fa108b80fb0572c695171e60efbf1b984dd7e Mon Sep 17 00:00:00 2001 From: Reedy Date: Fri, 24 Oct 2014 11:26:14 +0100 Subject: [PATCH] or -> || Change-Id: Ic591f06f70c68bb2912b7f028f7f988eb658375d --- includes/parser/Parser.php | 2 +- includes/search/SearchPostgres.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php index 8dc95934f2..fe0c81f338 100644 --- a/includes/parser/Parser.php +++ b/includes/parser/Parser.php @@ -2594,7 +2594,7 @@ class Parser { $t ); - if ( $openmatch or $closematch ) { + if ( $openmatch || $closematch ) { $paragraphStack = false; # @todo bug 5718: paragraph closed $output .= $this->closeParagraph(); diff --git a/includes/search/SearchPostgres.php b/includes/search/SearchPostgres.php index 59b0c31c9c..bda10b0bda 100644 --- a/includes/search/SearchPostgres.php +++ b/includes/search/SearchPostgres.php @@ -85,7 +85,7 @@ class SearchPostgres extends SearchDatabase { if ( strtolower( $terms[2] ) === 'and' ) { $searchstring .= ' & '; } - elseif ( strtolower( $terms[2] ) === 'or' or $terms[2] === '|' ) { + elseif ( strtolower( $terms[2] ) === 'or' || $terms[2] === '|' ) { $searchstring .= ' | '; } elseif ( strtolower( $terms[2] ) === 'not' ) { -- 2.20.1