From: Fomafix <fomafix@googlemail.com>
Date: Sat, 20 Apr 2019 15:23:50 +0000 (+0200)
Subject: rdbms,linker: Simplify implode() with empty array
X-Git-Tag: 1.34.0-rc.0~1909^2
X-Git-Url: http://git.cyclocoop.org/data/%24oldEdit?a=commitdiff_plain;h=0c91901454502b3ae2b7228b398aacd34f1a3d12;p=lhc%2Fweb%2Fwiklou.git

rdbms,linker: Simplify implode() with empty array

https://php.net/manual/en/function.implode.php#example-6071
  // Empty string when using an empty array:
  var_dump(implode('hello', array())); // string(0) ""

Change-Id: If6349ba914bb522129d482a714a30b889a4c9f11
---

diff --git a/includes/libs/rdbms/database/Database.php b/includes/libs/rdbms/database/Database.php
index beca66363b..6e30d3fca4 100644
--- a/includes/libs/rdbms/database/Database.php
+++ b/includes/libs/rdbms/database/Database.php
@@ -2713,8 +2713,8 @@ abstract class Database implements IDatabase, IMaintainableDatabase, LoggerAware
 		}
 
 		// We can't separate explicit JOIN clauses with ',', use ' ' for those
-		$implicitJoins = $ret ? implode( ',', $ret ) : "";
-		$explicitJoins = $retJOIN ? implode( ' ', $retJOIN ) : "";
+		$implicitJoins = implode( ',', $ret );
+		$explicitJoins = implode( ' ', $retJOIN );
 
 		// Compile our final table clause
 		return implode( ' ', [ $implicitJoins, $explicitJoins ] );
diff --git a/includes/linker/LinkRenderer.php b/includes/linker/LinkRenderer.php
index d096b001ea..c77b156f0b 100644
--- a/includes/linker/LinkRenderer.php
+++ b/includes/linker/LinkRenderer.php
@@ -293,7 +293,7 @@ class LinkRenderer {
 		return $this->makePreloadedLink(
 			$target,
 			$text,
-			$classes ? implode( ' ', $classes ) : '',
+			implode( ' ', $classes ),
 			$extraAttribs,
 			$query
 		);