From: Philip Tzou <philip@users.mediawiki.org>
Date: Wed, 6 Jan 2010 20:17:01 +0000 (+0000)
Subject: Change or to ||.
X-Git-Tag: 1.31.0-rc.0~38383
X-Git-Url: https://git.cyclocoop.org/%28%28?a=commitdiff_plain;h=38e71e6a2f4fea269f61087373dd22b62de4cd39;p=lhc%2Fweb%2Fwiklou.git

Change or to ||.
---

diff --git a/languages/Language.php b/languages/Language.php
index a368b31612..1909619711 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -1698,7 +1698,7 @@ class Language {
 	 */
 	function stripForSearch( $string ) {
 		global $wgDBtype, $wgSearchType;
-		if ( $wgDBtype != 'mysql' or $wgSearchType == 'LuceneSearch' ) {
+		if ( $wgDBtype != 'mysql' || $wgSearchType == 'LuceneSearch' ) {
 			return $string;
 		}