Special:Browse / Check for empty request (#1998)

SemanticMediaWiki · Nov 6, 2016 · 6f99c82 · 6f99c82
1 parent ad51c78
commit 6f99c82
Showing 1 changed file with 16 additions and 9 deletions.
diff --git a/src/MediaWiki/Specials/SpecialBrowse.php b/src/MediaWiki/Specials/SpecialBrowse.php
@@ -53,6 +53,7 @@ public function execute( $query ) {
 
 		// get the GET parameters
 		$articletext = $webRequest->getVal( 'article' );
+		$isEmptyRequest = $query === null && $webRequest->getVal( 'article' ) === '';
 
 		// @see SMWInfolink::encodeParameters
 		if ( $query === null && $this->getRequest()->getCheck( 'x' ) ) {
@@ -84,27 +85,33 @@ public function execute( $query ) {
 		) );
 
 		$out->addHTML(
-			$this->getHtml( $webRequest )
+			$this->getHtml( $webRequest, $isEmptyRequest )
 		);
 
 		$this->addExternalHelpLinks();
 	}
 
-	private function getHtml( $webRequest ) {
+	private function getHtml( $webRequest, $isEmptyRequest ) {
+
+		if ( $isEmptyRequest ) {
+			return HtmlContentBuilder::getPageSearchQuickForm();
+		}
 
 		if ( !$this->subjectDV->isValid() ) {
 
 			foreach ( $this->subjectDV->getErrors() as $error ) {
 				$error = Message::decode( $error );
 			}
 
-			return Html::rawElement(
-					'div',
-					array(
-						'class' => 'smw-callout smw-callout-error'
-					),
-					Message::get( array( 'smw-browse-invalid-subject', $error ) )
-				) . HtmlContentBuilder::getPageSearchQuickForm();
+			$html = Html::rawElement(
+				'div',
+				array(
+					'class' => 'smw-callout smw-callout-error'
+				),
+				Message::get( array( 'smw-browse-invalid-subject', $error ) )
+			);
+
+			return $html . HtmlContentBuilder::getPageSearchQuickForm();
 		}
 
 		$htmlContentBuilder = $this->newHtmlContentBuilder( $webRequest );