http://www.mediawiki.org/wiki/Special:Code/MediaWiki/76300

Revision: 76300
Author:   reedy
Date:     2010-11-08 12:23:24 +0000 (Mon, 08 Nov 2010)
Log Message:
-----------
Minor followup r75809, don't use nested if's unnecesserily

Modified Paths:
--------------
    trunk/phase3/includes/api/ApiQuerySearch.php

Modified: trunk/phase3/includes/api/ApiQuerySearch.php
===================================================================
--- trunk/phase3/includes/api/ApiQuerySearch.php        2010-11-08 11:32:40 UTC 
(rev 76299)
+++ trunk/phase3/includes/api/ApiQuerySearch.php        2010-11-08 12:23:24 UTC 
(rev 76300)
@@ -139,10 +139,8 @@
                                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 @@
                                                $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


_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

Reply via email to