or -> ||

Change-Id: Ic591f06f70c68bb2912b7f028f7f988eb658375d

diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php
index 8dc9593..fe0c81f 100644 (file)
--- 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 59b0c31..bda10b0 100644 (file)
--- 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' ) {