Merge branch 'staging' into feature/restore-php-2019-08

.travis.yml

@@ -26,12 +26,15 @@ matrix:
       env:
         - INSTALL_APCU="no"
         - INSTALL_MEMCACHE="yes"
+      dist: trusty
     - php: 5.5
       env:
         - INSTALL_MEMCACHE="yes"
+      dist: trusty
     - php: 5.6
       env:
         - INSTALL_MEMCACHE="yes"
+      dist: trusty
     - php: 7.0
     - php: 7.1
     - php: 7.2
@@ -45,6 +48,8 @@ services:
   - memcache
   - memcached
   - redis-server
+  - mysql
+  - postgresql
 
 before_script:
   # Make sure all dev dependencies are installed

administrator/components/com_categories/models/fields/categoryedit.php

@@ -32,7 +32,7 @@ class JFormFieldCategoryEdit extends JFormFieldList
 	 * Optional prefix for new categories.
 	 *
 	 * @var    string
-	 * @since  __DEPLOY_VERSION__
+	 * @since  3.9.11
 	 */
 	protected $customPrefix;
 

administrator/components/com_media/views/media/tmpl/default_navigation.php

@@ -12,7 +12,7 @@
 $style = $app->getUserStateFromRequest('media.list.layout', 'layout', 'thumbs', 'word');
 ?>
 
-<div class="media btn-group">
+<div class="media btn-group ventral-space">
 	<a href="#" id="thumbs" onclick="MediaManager.setViewType('thumbs')" class="btn <?php echo ($style == 'thumbs') ? 'active' : ''; ?>">
 	<span class="icon-grid-view-2"></span> <?php echo JText::_('COM_MEDIA_THUMBNAIL_VIEW'); ?></a>
 	<a href="#" id="details" onclick="MediaManager.setViewType('details')" class="btn <?php echo ($style == 'details') ? 'active' : ''; ?>">

administrator/components/com_templates/views/template/tmpl/default_tree.php

@@ -8,7 +8,7 @@
  */
 
 defined('_JEXEC') or die;
-ksort($this->files, SORT_STRING);
+ksort($this->files, SORT_NATURAL);
 ?>
 
 <ul class='nav nav-list directory-tree'>

administrator/language/en-GB/en-GB.xml

@@ -2,7 +2,7 @@
 <metafile version="3.8" client="administrator">
 	<name>English (en-GB)</name>
 	<version>3.9.11</version>
-	<creationDate>July 2019</creationDate>
+	<creationDate>August 2019</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>

administrator/language/en-GB/install.xml

@@ -3,7 +3,7 @@
 	<name>English (en-GB)</name>
 	<tag>en-GB</tag>
 	<version>3.9.11</version>
-	<creationDate>July 2019</creationDate>
+	<creationDate>August 2019</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>

administrator/manifests/files/joomla.xml

@@ -7,7 +7,7 @@
 	<copyright>(C) 2005 - 2019 Open Source Matters. All rights reserved</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<version>3.9.11-dev</version>
-	<creationDate>July 2019</creationDate>
+	<creationDate>August 2019</creationDate>
 	<description>FILES_JOOMLA_XML_DESCRIPTION</description>
 
 	<scriptfile>administrator/components/com_admin/script.php</scriptfile>

administrator/manifests/packages/pkg_en-GB.xml

@@ -3,7 +3,7 @@
 	<name>English (en-GB) Language Pack</name>
 	<packagename>en-GB</packagename>
 	<version>3.9.11.1</version>
-	<creationDate>July 2019</creationDate>
+	<creationDate>August 2019</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>

administrator/templates/isis/css/template-rtl.css

@@ -7760,6 +7760,9 @@ input.field-media-input {
 		display: none;
 	}
 }
+.ventral-space {
+	margin-bottom: 5px;
+}
 ul.manager .height-50 .icon-folder-2 {
 	height: 35px;
 	width: 35px;

administrator/templates/isis/css/template.css

@@ -7760,6 +7760,9 @@ input.field-media-input {
 		display: none;
 	}
 }
+.ventral-space {
+	margin-bottom: 5px;
+}
 ul.manager .height-50 .icon-folder-2 {
 	height: 35px;
 	width: 35px;

administrator/templates/isis/less/blocks/_media.less

@@ -1,5 +1,10 @@
 // Media 
 
+/* Spacing below buttons in media manager */
+.ventral-space{
+	margin-bottom: 5px;
+}
+
 /* Media Manager folder icon override */
 ul.manager .height-50 .icon-folder-2 {
 	height: 35px;

htaccess.txt

@@ -8,8 +8,8 @@
 # READ THIS COMPLETELY IF YOU CHOOSE TO USE THIS FILE!
 #
 # The line 'Options +FollowSymLinks' may cause problems with some server configurations.
-# It is required for the use of mod_rewrite, but it may have already been set by your
-# server administrator in a way that disallows changing it in this .htaccess file.
+# It is required for the use of Apache mod_rewrite, but it may have already been set by 
+# your server administrator in a way that disallows changing it in this .htaccess file.
 # If using it causes your site to produce an error, comment it out (add # to the
 # beginning of the line), reload your site in your browser and test your sef urls. If
 # they work, then it has been set by your server administrator and you do not need to

installation/language/en-GB/en-GB.xml

@@ -4,7 +4,7 @@
 	client="installation">
 	<name>English (United Kingdom)</name>
 	<version>3.9.11</version>
-	<creationDate>July 2019</creationDate>
+	<creationDate>August 2019</creationDate>
 	<author>Joomla! Project</author>
 	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>

language/en-GB/en-GB.xml

@@ -2,7 +2,7 @@
 <metafile version="3.8" client="site">
 	<name>English (en-GB)</name>
 	<version>3.9.11</version>
-	<creationDate>July 2019</creationDate>
+	<creationDate>August 2019</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>

language/en-GB/install.xml

@@ -3,7 +3,7 @@
 	<name>English (en-GB)</name>
 	<tag>en-GB</tag>
 	<version>3.9.11</version>
-	<creationDate>July 2019</creationDate>
+	<creationDate>August 2019</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>

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);
 	}
 }

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))

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
 		{

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";
 

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');

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);
 	}
 
 	/**

libraries/src/MVC/Model/AdminModel.php

@@ -408,6 +408,7 @@ protected function batchCopy($value, $pks, $contexts)
 		}
 
 		$newIds = array();
+		$db     = $this->getDbo();
 
 		// Parent exists so let's proceed
 		while (!empty($pks))
@@ -435,6 +436,12 @@ protected function batchCopy($value, $pks, $contexts)
 				}
 			}
 
+			// Check for asset_id
+			if ($this->table->hasField($this->table->getColumnAlias('asset_id')))
+			{
+				$oldAssetId = $this->table->asset_id;
+			}
+
 			$this->generateTitle($categoryId, $this->table);
 
 			// Reset the ID because we are making a copy
@@ -487,6 +494,21 @@ protected function batchCopy($value, $pks, $contexts)
 			// Get the new item ID
 			$newId = $this->table->get('id');
 
+			if (!empty($oldAssetId))
+			{
+				// Copy rules
+				$query = $db->getQuery(true);
+				$query->clear()
+					->update($db->quoteName('#__assets', 't'))
+					->join('INNER', $db->quoteName('#__assets', 's') .
+						' ON ' . $db->quoteName('s.id') . ' = ' . $oldAssetId
+					)
+					->set($db->quoteName('t.rules') . ' = ' . $db->quoteName('s.rules'))
+					->where($db->quoteName('t.id') . ' = ' . $this->table->asset_id);
+
+				$db->setQuery($query)->execute();
+			}
+
 			$this->cleanupPostBatchCopy($this->table, $newId, $pk);
 
 			// Add the new ID to the array

libraries/src/Router/Route.php

@@ -10,6 +10,7 @@
 
 defined('JPATH_PLATFORM') or die;
 
+use Joomla\CMS\Log\Log;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Uri\Uri;
 
@@ -74,6 +75,18 @@ public static function _($url, $xhtml = true, $tls = self::TLS_IGNORE, $absolute
 				$tls = self::TLS_DISABLE;
 			}
 
+			// @deprecated  4.0 Before 3.9.7 this method silently converted $tls to integer
+			if (!is_int($tls))
+			{
+				Log::add(
+					__METHOD__ . '() called with incompatible variable type on parameter $tls.',
+					Log::WARNING,
+					'deprecated'
+				);
+
+				$tls = (int) $tls;
+			}
+
 			$app    = Factory::getApplication();
 			$client = $app->getName();
 

libraries/src/Table/Table.php

@@ -1722,4 +1722,20 @@ protected function _unlock()
 
 		return true;
 	}
+
+	/**
+	 * Check if the record has a property (applying a column alias if it exists)
+	 *
+	 * @param   string  $key  key to be checked
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.9.11
+	 */
+	public function hasField($key)
+	{
+		$key = $this->getColumnAlias($key);
+
+		return property_exists($this, $key);
+	}
 }

libraries/src/Version.php

@@ -111,15 +111,15 @@ final class Version
 	 * @var    string
 	 * @since  3.5
 	 */
-	const RELDATE = '10-July-2019';
+	const RELDATE = '8-August-2019';
 
 	/**
 	 * Release time.
 	 *
 	 * @var    string
 	 * @since  3.5
 	 */
-	const RELTIME = '16:04';
+	const RELTIME = '13:55';
 
 	/**
 	 * Release timezone.

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);
 			}
 		}