Merge branch 'staging' into jroute-workaround

joomla · Aug 8, 2019 · 74e9ea0 · 74e9ea0
2 parents 2838df3 + 8756a48
commit 74e9ea0
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 17 deletions.
diff --git a/libraries/cms/html/tel.php b/libraries/cms/html/tel.php
@@ -42,7 +42,7 @@ public static function tel($number, $displayplan)
 			$display[0] = '+';
 			$display[1] = $countrycode;
 			$display[2] = ' ';
-			$display[3] = implode(str_split($number, 2), ' ');
+			$display[3] = implode(' ', str_split($number, 2));
 		}
 		elseif ($displayplan === 'NANP' || $displayplan === 'northamerica' || $displayplan === 'US')
 		{
@@ -62,14 +62,14 @@ public static function tel($number, $displayplan)
 		}
 		elseif ($displayplan === 'ARPA' || $displayplan === 'ENUM')
 		{
-			$number = implode(str_split(strrev($number), 1), '.');
+			$number = implode('.', str_split(strrev($number), 1));
 			$display[0] = '+';
 			$display[1] = $number;
 			$display[2] = '.';
 			$display[3] = $countrycode;
 			$display[4] = '.e164.arpa';
 		}
 
-		return implode($display, '');
+		return implode('', $display);
 	}
 }
diff --git a/libraries/fof/render/joomla.php b/libraries/fof/render/joomla.php
@@ -4,6 +4,7 @@
  * @subpackage  render
  * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ * @note        This file has been modified by the Joomla! Project and no longer reflects the original work of its author.
  */
 defined('FOF_INCLUDED') or die;
 
@@ -106,7 +107,7 @@ public function preRender($view, $task, $input, $config = array())
 			);
 		}
 
-		echo '<div id="akeeba-renderjoomla" class="' . implode($classes, ' ') . "\">\n";
+		echo '<div id="akeeba-renderjoomla" class="' . implode(' ', $classes) . "\">\n";
 
 		// Render submenu and toolbar (only if asked to)
 		if ($input->getBool('render_toolbar', true))

diff --git a/libraries/fof/render/joomla3.php b/libraries/fof/render/joomla3.php
@@ -4,6 +4,7 @@
  * @subpackage  render
  * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ * @note        This file has been modified by the Joomla! Project and no longer reflects the original work of its author.
  */
 defined('FOF_INCLUDED') or die;
 
@@ -79,15 +80,18 @@ public function preRender($view, $task, $input, $config = array())
 			$layout = $input->getCmd('layout', '');
 			$task = $input->getCmd('task', '');
 
-			$classes = ' class="' . implode(array(
-				'joomla-version-' . $majorVersion,
-				'joomla-version-' . $minorVersion,
-				'admin',
-				$option,
-				'view-' . $view,
-				'layout-' . $layout,
-				'task-' . $task,
-			), ' ') . '"';
+			$classes = ' class="' . implode(
+				' ',
+				array(
+					'joomla-version-' . $majorVersion,
+					'joomla-version-' . $minorVersion,
+					'admin',
+					$option,
+					'view-' . $view,
+					'layout-' . $layout,
+					'task-' . $task,
+				)
+			) . '"';
 		}
 		else
 		{

diff --git a/libraries/fof/render/strapper.php b/libraries/fof/render/strapper.php
@@ -4,6 +4,7 @@
  * @subpackage  render
  * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ * @note        This file has been modified by the Joomla! Project and no longer reflects the original work of its author.
  */
 defined('FOF_INCLUDED') or die;
 
@@ -111,7 +112,7 @@ public function preRender($view, $task, $input, $config = array())
 		}
 
 		// Wrap output in divs
-		echo '<div id="akeeba-bootstrap" class="' . implode($classes, ' ') . "\">\n";
+		echo '<div id="akeeba-bootstrap" class="' . implode(' ', $classes) . "\">\n";
 		echo "<div class=\"akeeba-bootstrap\">\n";
 		echo "<div class=\"row-fluid\">\n";
 

diff --git a/libraries/joomla/google/data/picasa.php b/libraries/joomla/google/data/picasa.php
@@ -106,7 +106,7 @@ public function createAlbum($userID = 'default', $title = '', $access = 'private
 			$xml->addChild('gphoto:access', $access);
 			$xml->addChild('gphoto:timestamp', $time);
 			$media = $xml->addChild('media:group', '', 'http://search.yahoo.com/mrss/');
-			$media->addChild('media:keywords', implode($keywords, ', '));
+			$media->addChild('media:keywords', implode(', ', $keywords));
 			$cat = $xml->addChild('category', '');
 			$cat->addAttribute('scheme', 'http://schemas.google.com/g/2005#kind');
 			$cat->addAttribute('term', 'http://schemas.google.com/photos/2007#album');

diff --git a/libraries/src/Layout/BaseLayout.php b/libraries/src/Layout/BaseLayout.php
@@ -160,7 +160,7 @@ public function render($displayData)
 	 */
 	public function renderDebugMessages()
 	{
-		return implode($this->debugMessages, "\n");
+		return implode("\n", $this->debugMessages);
 	}
 
 	/**

diff --git a/plugins/editors/tinymce/tinymce.php b/plugins/editors/tinymce/tinymce.php
@@ -840,7 +840,7 @@ private function tinyButtons($name, $excluded)
 				$btnsNames[] = $name . ' | ';
 
 				// The array with code for each button
-				$tinyBtns[] = implode($tempConstructor, '');
+				$tinyBtns[] = implode('', $tempConstructor);
 			}
 		}