From: Derick Alangi <alangiderick@gmail.com>
Date: Wed, 27 Mar 2019 11:40:42 +0000 (+0100)
Subject: linkeddata: Remove unnecessary arguments and shrink if...else
X-Git-Tag: 1.34.0-rc.0~2321^2
X-Git-Url: http://git.cyclocoop.org/%7B%7B%20url_for%28%27admin_vote_add%27%29%20%7D%7D?a=commitdiff_plain;h=c6c84b2474fa55759b22fd38b33d3f90dab8e882;p=lhc%2Fweb%2Fwiklou.git

linkeddata: Remove unnecessary arguments and shrink if...else

if...else that returns bool can be shrinked down to a single return
statement like in this case.

Change-Id: Ic50fac1825cbdbcc052dcd470e896a9344c8e418
---

diff --git a/includes/linkeddata/PageDataRequestHandler.php b/includes/linkeddata/PageDataRequestHandler.php
index 61efba02b8..93aa89f724 100644
--- a/includes/linkeddata/PageDataRequestHandler.php
+++ b/includes/linkeddata/PageDataRequestHandler.php
@@ -43,11 +43,7 @@ class PageDataRequestHandler {
 	 */
 	public function canHandleRequest( $subPage, WebRequest $request ) {
 		if ( $subPage === '' || $subPage === null ) {
-			if ( $request->getText( 'target', '' ) === '' ) {
-				return false;
-			} else {
-				return true;
-			}
+			return $request->getText( 'target' ) !== '';
 		}
 
 		$parts = explode( '/', $subPage, 2 );
@@ -90,7 +86,7 @@ class PageDataRequestHandler {
 		if ( $subPage !== '' ) {
 			$title = $parts[1];
 		} else {
-			$title = $request->getText( 'target', '' );
+			$title = $request->getText( 'target' );
 		}
 
 		$revision = $request->getInt( 'oldid', $revision );
@@ -145,7 +141,7 @@ class PageDataRequestHandler {
 		}
 
 		$negotiator = new HttpAcceptNegotiator( $mimeTypes );
-		$format = $negotiator->getBestSupportedKey( $accept, null );
+		$format = $negotiator->getBestSupportedKey( $accept );
 
 		if ( $format === null ) {
 			$format = isset( $accept['text/html'] ) ? 'text/html' : null;