From: Sam Reed <reedy@users.mediawiki.org>
Date: Mon, 8 Nov 2010 12:23:24 +0000 (+0000)
Subject: Minor followup r75809, don't use nested if's unnecesserily
X-Git-Tag: 1.31.0-rc.0~33996
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/password.php?a=commitdiff_plain;h=f91f81349440bc067ee65aeb0d9c876bd59b2083;p=lhc%2Fweb%2Fwiklou.git

Minor followup r75809, don't use nested if's unnecesserily
---

diff --git a/includes/api/ApiQuerySearch.php b/includes/api/ApiQuerySearch.php
index 0bd6b1f674..637f735887 100644
--- a/includes/api/ApiQuerySearch.php
+++ b/includes/api/ApiQuerySearch.php
@@ -139,10 +139,8 @@ class ApiQuerySearch extends ApiQueryGeneratorBase {
 				if ( isset( $prop['timestamp'] ) ) {
 					$vals['timestamp'] = wfTimestamp( TS_ISO_8601, $result->getTimestamp() );
 				}
-				if ( !is_null( $result->getScore() ) ) {
-					if ( isset( $prop['score'] ) ) {
-						$vals['score'] = $result->getScore();
-					}
+				if ( !is_null( $result->getScore() ) && isset( $prop['score'] ) ) {
+					$vals['score'] = $result->getScore();
 				}
 				if ( isset( $prop['titlesnippet'] ) ) {
 					$vals['titlesnippet'] = $result->getTitleSnippet( $terms );
@@ -163,10 +161,8 @@ class ApiQuerySearch extends ApiQueryGeneratorBase {
 						$vals['sectionsnippet'] = $result->getSectionSnippet();
 					}
 				}
-				if ( isset( $prop['hasrelated'] ) ) {
-					if ( $result->hasRelated() ) {
-						$vals['hasrelated'] = "";
-					}
+				if ( isset( $prop['hasrelated'] ) && $result->hasRelated() ) {
+					$vals['hasrelated'] = "";
 				}
 
 				// Add item to results and see whether it fits