Merge branch 'staging' of github.com:joomla/joomla-cms into disabled_…

…fields

.github/CODEOWNERS

@@ -13,13 +13,6 @@ modules/mod_finder/*  @mbabker
 plugins/content/finder/*  @mbabker
 plugins/finder/*  @mbabker
 
-# Language strings
-administrator/language/en-GB/*  @brianteeman
-installation/language/en-GB/*  @brianteeman
-language/en-GB/*  @brianteeman
-README.md  @brianteeman
-README.txt  @brianteeman
-
 # CodeMirror
 media/editors/codemirror/*  @okonomiyaki3000
 plugins/editors/codemirror/*  @okonomiyaki3000

.travis.yml

@@ -36,6 +36,7 @@ matrix:
     - php: nightly
       env: INSTALL_APCU="no" INSTALL_MEMCACHE="no" INSTALL_MEMCACHED="no"
   allow_failures:
+    - php: 7.3
     - php: nightly
 
 services:

administrator/components/com_actionlogs/helpers/actionlogs.php

@@ -95,6 +95,7 @@ public static function loadTranslationFiles($extension)
 		}
 
 		$lang   = JFactory::getLanguage();
+		$source = '';
 
 		switch (substr($extension, 0, 3))
 		{
@@ -113,7 +114,15 @@ public static function loadTranslationFiles($extension)
 
 			case 'plg':
 				$parts = explode('_', $extension, 3);
-				$source = JPATH_PLUGINS . '/' . $parts[1] . '/' . $parts[2];
+
+				if (count($parts) > 2)
+				{
+					$source = JPATH_PLUGINS . '/' . $parts[1] . '/' . $parts[2];
+				}
+				break;
+
+			case 'pkg':
+				$source = JPATH_SITE;
 				break;
 
 			case 'tpl':

administrator/components/com_actionlogs/models/actionlogs.php

@@ -144,7 +144,7 @@ protected function getListQuery()
 			}
 			elseif (stripos($search, 'item_id:') === 0)
 			{
-				$query->where($db->quoteName('a.item_id') . ' = ' . (int) substr($search, 3));
+				$query->where($db->quoteName('a.item_id') . ' = ' . (int) substr($search, 8));
 			}
 			else
 			{

administrator/components/com_admin/sql/updates/sqlazure/3.9.0-2018-05-05.sql

@@ -80,8 +80,10 @@ CREATE TABLE [#__action_log_config](
 	[id] [int] IDENTITY(1,1) NOT NULL,
 	[type_title] [nvarchar](255) NOT NULL DEFAULT '',
 	[type_alias] [nvarchar](255) NOT NULL DEFAULT '',
+	[id_holder] [nvarchar](255) NULL,
 	[title_holder] [nvarchar](255) NULL,
-	[table_values] [nvarchar](255) NULL
+	[table_name] [nvarchar](255) NULL,
+	[text_prefix] [nvarchar](255) NULL,
 	CONSTRAINT [PK_#__action_log_config_id] PRIMARY KEY CLUSTERED
  (
  	[id] ASC

administrator/components/com_banners/tables/client.php

@@ -30,6 +30,8 @@ public function __construct(&$db)
 		$this->checked_out_time = $db->getNullDate();
 		parent::__construct('#__banner_clients', 'id', $db);
 
+		$this->setColumnAlias('published', 'state');
+
 		JTableObserverContenthistory::createObserver($this, array('typeAlias' => 'com_banners.client'));
 	}
 

administrator/components/com_config/model/application.php

@@ -488,6 +488,12 @@ private function writeConfigFile(Registry $config)
 			throw new RuntimeException(JText::_('COM_CONFIG_ERROR_WRITE_FAILED'));
 		}
 
+		// Invalidates the cached configuration file
+		if (function_exists('opcache_invalidate'))
+		{
+			opcache_invalidate($file);
+		}
+
 		// Attempt to make the file unwriteable if using FTP.
 		if (!$ftp['enabled'] && JPath::isOwner($file) && !JPath::setPermissions($file, '0444'))
 		{

administrator/components/com_content/models/articles.php

@@ -210,7 +210,7 @@ protected function getListQuery()
 			->join('LEFT', '#__categories AS c ON c.id = a.catid');
 
 		// Join over the parent categories.
-		$query->select('parent.title AS parent_category_title, parent.id AS parent_category_id, 
+		$query->select('parent.title AS parent_category_title, parent.id AS parent_category_id,
 								parent.created_user_id AS parent_category_uid, parent.level AS parent_category_level')
 			->join('LEFT', '#__categories AS parent ON parent.id = c.parent_id');
 
@@ -224,17 +224,17 @@ protected function getListQuery()
 		if (JPluginHelper::isEnabled('content', 'vote'))
 		{
 			$assogroup .= ', v.rating_sum, v.rating_count';
-			$query->select('COALESCE(NULLIF(ROUND(v.rating_sum  / v.rating_count, 0), 0), 0) AS rating, 
+			$query->select('COALESCE(NULLIF(ROUND(v.rating_sum  / v.rating_count, 0), 0), 0) AS rating,
 					COALESCE(NULLIF(v.rating_count, 0), 0) as rating_count')
 				->join('LEFT', '#__content_rating AS v ON a.id = v.content_id');
 		}
 
 		// Join over the associations.
 		if (JLanguageAssociations::isEnabled())
 		{
-			$query->select('COUNT(asso2.id)>1 as association')
+			$query->select('CASE WHEN COUNT(asso2.id)>1 THEN 1 ELSE 0 END as association')
 				->join('LEFT', '#__associations AS asso ON asso.id = a.id AND asso.context=' . $db->quote('com_content.item'))
-				->join('LEFT', '#__associations AS asso2 ON asso2.key = asso.key')
+				->join('LEFT', '#__associations AS asso2 ON ' . $db->quoteName('asso2.key') . ' = ' . $db->quoteName('asso.key'))
 				->group($assogroup);
 		}
 

administrator/components/com_finder/tables/filter.php

@@ -29,6 +29,8 @@ class FinderTableFilter extends JTable
 	public function __construct(&$db)
 	{
 		parent::__construct('#__finder_filters', 'filter_id', $db);
+
+		$this->setColumnAlias('published', 'state');
 	}
 
 	/**

administrator/components/com_messages/tables/message.php

@@ -28,6 +28,8 @@ class MessagesTableMessage extends JTable
 	public function __construct(&$db)
 	{
 		parent::__construct('#__messages', 'message_id', $db);
+
+		$this->setColumnAlias('published', 'state');
 	}
 
 	/**

administrator/components/com_tags/models/tags.php

@@ -141,7 +141,7 @@ protected function getListQuery()
 		$query->select(
 			$this->getState(
 				'list.select',
-				'a.id, a.title, a.alias, a.note, a.published, a.access' .
+				'a.id, a.title, a.alias, a.note, a.published, a.access, a.description' .
 					', a.checked_out, a.checked_out_time, a.created_user_id' .
 					', a.path, a.parent_id, a.level, a.lft, a.rgt' .
 					', a.language'

administrator/components/com_users/tables/note.php

@@ -29,6 +29,8 @@ public function __construct(&$db)
 	{
 		parent::__construct('#__user_notes', 'id', $db);
 
+		$this->setColumnAlias('published', 'state');
+
 		JTableObserverContenthistory::createObserver($this, array('typeAlias' => 'com_users.note'));
 	}
 

administrator/language/en-GB/en-GB.ini

@@ -342,7 +342,7 @@ JGLOBAL_CREATED_DATE="Created Date"
 JGLOBAL_CUSTOM_CATEGORY="New Categories"
 JGLOBAL_CUSTOM_FIELDS_ENABLE_DESC="Enable the creation of custom fields."
 JGLOBAL_CUSTOM_FIELDS_ENABLE_LABEL="Enable Custom Fields"
-JGLOBAL_DATE_FORMAT_DESC="Optional format string for showing the date. For example, D M Y for day month year or you can use d-m-y for a short version eg. 28-12-16. See http://www.php.net/manual/en/function.date.php. If left blank, it uses DATE_FORMAT_LC1 from your language file."
+JGLOBAL_DATE_FORMAT_DESC="Optional format string for showing the date. For example, D M Y for day month year or you can use d-m-y for a short version eg. 28-12-16. See https://php.net/date. If left blank, it uses DATE_FORMAT_LC1 from your language file."
 JGLOBAL_DATE_FORMAT_LABEL="Date Format"
 JGLOBAL_DESCRIPTION="Description"
 JGLOBAL_DISPLAY_NUM="Display #"

administrator/language/en-GB/en-GB.mod_latestactions.ini

@@ -8,4 +8,7 @@ MOD_LATESTACTIONS_FIELD_COUNT_LABEL="Count"
 MOD_LATESTACTIONS_FIELD_COUNT_DESC="The number of items to display (default 5)."
 MOD_LATESTACTIONS_LAYOUT_DEFAULT="Default"
 MOD_LATEST_ACTIONS_NO_MATCHING_RESULTS="No Matching Results"
+MOD_LATESTACTIONS_TITLE="Last Actions"
+MOD_LATESTACTIONS_TITLE_1="Last Action"
+MOD_LATESTACTIONS_TITLE_MORE="Last %s Actions"
 MOD_LATESTACTIONS_XML_DESCRIPTION="This module shows a list of the most recent actions."

administrator/language/en-GB/en-GB.plg_privacy_actionlogs.ini

@@ -4,4 +4,4 @@
 ; Note : All ini files need to be saved as UTF-8
 
 PLG_PRIVACY_ACTIONLOGS="Privacy - Action Logs"
-PLG_PRIVACY_ACTIONLOGS_XML_DESCRIPTION="Responsible for exporting the action log data for a user's privacy request. Since the action logs are an audit log, these can not be deleted from the system."
+PLG_PRIVACY_ACTIONLOGS_XML_DESCRIPTION="Responsible for exporting the action log data for a user's privacy request."

administrator/language/en-GB/en-GB.plg_privacy_actionlogs.sys.ini

@@ -4,4 +4,4 @@
 ; Note : All ini files need to be saved as UTF-8
 
 PLG_PRIVACY_ACTIONLOGS="Privacy - Action Logs"
-PLG_PRIVACY_ACTIONLOGS_XML_DESCRIPTION="Responsible for exporting the action log data for a user's privacy request. Since the action logs are an audit log, these can not be deleted from the system."
+PLG_PRIVACY_ACTIONLOGS_XML_DESCRIPTION="Responsible for exporting the action log data for a user's privacy request."

administrator/language/en-GB/en-GB.plg_system_actionlogs.ini

@@ -11,7 +11,7 @@ PLG_SYSTEM_ACTIONLOGS_LOG_DELETE_PERIOD_DESC="Enter how many days logs should be
 PLG_SYSTEM_ACTIONLOGS_NOTIFICATIONS="Send notifications for User Actions Log"
 PLG_SYSTEM_ACTIONLOGS_NOTIFICATIONS_DESC="Send a notifications of users' actions log to your email"
 PLG_SYSTEM_ACTIONLOGS_OPTIONS="User Actions Log Options"
-PLG_SYSTEM_ACTIONLOGS_XML_DESCRIPTION="Record the actions of users on the site so they can be reviewed if required."
+PLG_SYSTEM_ACTIONLOGS_XML_DESCRIPTION="Records the actions of users on the site so they can be reviewed if required."
 ; Common content type log messages
 PLG_SYSTEM_ACTIONLOGS_CONTENT_ADDED="User <a href=\"{accountlink}\">{username}</a> added new {type} <a href=\"{itemlink}\">{title}</a>"
 PLG_SYSTEM_ACTIONLOGS_CONTENT_ARCHIVED="User <a href=\"{accountlink}\">{username}</a> archived the {type} <a href=\"{itemlink}\">{title}</a>"

administrator/language/en-GB/en-GB.plg_system_actionlogs.sys.ini

@@ -4,4 +4,4 @@
 ; Note : All ini files need to be saved as UTF-8
 
 PLG_SYSTEM_ACTIONLOGS="System - User Actions Log"
-PLG_SYSTEM_ACTIONLOGS_XML_DESCRIPTION="To record actions of users within the CMS, to know who to blame when something wrong happens."
+PLG_SYSTEM_ACTIONLOGS_XML_DESCRIPTION="Records the actions of users on the site so they can be reviewed if required."

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

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <metafile version="3.8" client="administrator">
 	<name>English (en-GB)</name>
-	<version>3.9.1</version>
-	<creationDate>October 2018</creationDate>
+	<version>3.9.2</version>
+	<creationDate>November 2018</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>

administrator/language/en-GB/install.xml

@@ -2,8 +2,8 @@
 <extension version="3.8" client="administrator" type="language" method="upgrade">
 	<name>English (en-GB)</name>
 	<tag>en-GB</tag>
-	<version>3.9.1</version>
-	<creationDate>October 2018</creationDate>
+	<version>3.9.2</version>
+	<creationDate>November 2018</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>

administrator/manifests/files/joomla.xml

@@ -6,8 +6,8 @@
 	<authorUrl>www.joomla.org</authorUrl>
 	<copyright>(C) 2005 - 2018 Open Source Matters. All rights reserved</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
-	<version>3.9.1-dev</version>
-	<creationDate>October 2018</creationDate>
+	<version>3.9.2-dev</version>
+	<creationDate>November 2018</creationDate>
 	<description>FILES_JOOMLA_XML_DESCRIPTION</description>
 
 	<scriptfile>administrator/components/com_admin/script.php</scriptfile>

administrator/manifests/packages/pkg_en-GB.xml

@@ -2,8 +2,8 @@
 <extension type="package" version="3.8" method="upgrade">
 	<name>English (en-GB) Language Pack</name>
 	<packagename>en-GB</packagename>
-	<version>3.9.1.1</version>
-	<creationDate>October 2018</creationDate>
+	<version>3.9.2.1</version>
+	<creationDate>November 2018</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>

administrator/modules/mod_latestactions/helper.php

@@ -49,4 +49,18 @@ public static function getList(&$params)
 
 		return $rows;
 	}
+
+	/**
+	 * Get the alternate title for the module
+	 *
+	 * @param   \Joomla\Registry\Registry  $params  The module parameters.
+	 *
+	 * @return  string    The alternate title for the module.
+	 *
+	 * @since   3.9.1
+	 */
+	public static function getTitle($params)
+	{
+		return JText::plural('MOD_LATESTACTIONS_TITLE', $params->get('count', 5));
+	}
 }

administrator/modules/mod_latestactions/mod_latestactions.php

@@ -22,7 +22,7 @@
 
 if ($params->get('automatic_title', 0))
 {
-	$module->title = ModLatestHelper::getTitle($params);
+	$module->title = ModLatestActionsHelper::getTitle($params);
 }
 
 require JModuleHelper::getLayoutPath('mod_latestactions', $params->get('layout', 'default'));