Merge branch '3.9-dev' into qq

README.md

@@ -11,7 +11,7 @@ What is this?
 ---------------------
 * This is a Joomla! 3.x installation/upgrade package.
 * Joomla's [Official website](https://www.joomla.org).
-* Joomla! 3.8 [version history](https://docs.joomla.org/Special:MyLanguage/Joomla_3.8_version_history).
+* Joomla! 3.9 [version history](https://docs.joomla.org/Special:MyLanguage/Joomla_3.9_version_history).
 * Detailed changes are in the [changelog](https://github.com/joomla/joomla-cms/commits/staging).
 
 What is Joomla?

README.txt

@@ -1,7 +1,7 @@
 1- What is this?
 	* This is a Joomla! installation/upgrade package to version 3.x
 	* Joomla! Official site: https://www.joomla.org
-	* Joomla! 3.8 version history - https://docs.joomla.org/Special:MyLanguage/Joomla_3.8_version_history
+	* Joomla! 3.9 version history - https://docs.joomla.org/Special:MyLanguage/Joomla_3.9_version_history
 	* Detailed changes in the Changelog: https://github.com/joomla/joomla-cms/commits/staging
 
 2- What is Joomla?

administrator/components/com_content/config.xml

@@ -867,6 +867,7 @@
 			<option value="author">JAUTHOR</option>
 			<option value="hits">JGLOBAL_HITS</option>
 			<option value="tag">JTAG</option>
+			<option value="month">JMONTH_PUBLISHED</option>
 		</field>
 
 		<field 

administrator/components/com_content/models/articles.php

@@ -330,6 +330,11 @@ protected function getListQuery()
 				$search = $db->quote('%' . $db->escape(substr($search, 7), true) . '%');
 				$query->where('(ua.name LIKE ' . $search . ' OR ua.username LIKE ' . $search . ')');
 			}
+			elseif (stripos($search, 'content:') === 0)
+			{
+				$search = $db->quote('%' . $db->escape(substr($search, 8), true) . '%');
+				$query->where('(a.introtext LIKE ' . $search . ' OR a.fulltext LIKE ' . $search . ')');
+			}
 			else
 			{
 				$search = $db->quote('%' . str_replace(' ', '%', $db->escape(trim($search), true) . '%'));

administrator/components/com_content/models/featured.php

@@ -199,6 +199,11 @@ protected function getListQuery()
 				$search = $db->quote('%' . $db->escape(substr($search, 7), true) . '%');
 				$query->where('(ua.name LIKE ' . $search . ' OR ua.username LIKE ' . $search . ')');
 			}
+			elseif (stripos($search, 'content:') === 0)
+			{
+				$search = $db->quote('%' . $db->escape(substr($search, 8), true) . '%');
+				$query->where('(a.introtext LIKE ' . $search . ' OR a.fulltext LIKE ' . $search . ')');
+			}
 			else
 			{
 				$search = $db->quote('%' . str_replace(' ', '%', $db->escape(trim($search), true) . '%'));

administrator/components/com_installer/models/extension.php

@@ -182,8 +182,15 @@ protected function translate(&$items)
 						$lang->load("$extension.sys", JPATH_SITE, null, false, true);
 				break;
 				case 'library':
-					$extension = 'lib_' . $item->element;
-						$lang->load("$extension.sys", JPATH_SITE, null, false, true);
+					$parts = explode('/', $item->element);
+					$vendor = (isset($parts[1]) ? $parts[0] : null);
+					$extension = 'lib_' . ($vendor ? implode('_', $parts) : $item->element);
+
+					if (!$lang->load("$extension.sys", $path, null, false, true))
+					{
+						$source = $path . '/libraries/' . ($vendor ? $vendor . '/' . $parts[1] : $item->element);
+						$lang->load("$extension.sys", $source, null, false, true);
+					}
 				break;
 				case 'module':
 					$extension = $item->element;

administrator/components/com_installer/models/install.php

@@ -170,6 +170,29 @@ public function install()
 			}
 		}
 
+		// Check the package
+		$children = $installer->manifest->updateservers->children();
+
+		foreach ($children as $child)
+		{
+			$check = JInstallerHelper::isChecksumValid($package['packagefile'], (string) $child);
+
+			switch ($check)
+			{
+				case 0:
+					$app->enqueueMessage(\JText::_('COM_INSTALLER_INSTALL_CHECKSUM_WRONG'), 'warning');
+					break;
+
+				case 1:
+					$app->enqueueMessage(\JText::_('COM_INSTALLER_INSTALL_CHECKSUM_CORRECT'), 'message');
+					break;
+
+				case 2:
+					$app->enqueueMessage(\JText::_('COM_INSTALLER_INSTALL_CHECKSUM_NOT_FOUND'), 'notice');
+					break;
+			}
+		}
+
 		// Was the package unpacked?
 		if (!$package || !$package['type'])
 		{

administrator/components/com_installer/models/update.php

@@ -361,7 +361,7 @@ public function update($uids, $minimum_stability = JUpdater::STABILITY_STABLE)
 			$this->preparePreUpdate($update, $instance);
 
 			// Install sets state and enqueues messages
-			$res = $this->install($update);
+			$res = $this->install($update, $instance->detailsurl);
 
 			if ($res)
 			{
@@ -388,13 +388,14 @@ public function update($uids, $minimum_stability = JUpdater::STABILITY_STABLE)
 	/**
 	 * Handles the actual update installation.
 	 *
-	 * @param   JUpdate  $update  An update definition
+	 * @param   JUpdate  $update     An update definition
+	 * @param   string   $updateurl  Update Server manifest
 	 *
 	 * @return  boolean   Result of install
 	 *
 	 * @since   1.6
 	 */
-	private function install($update)
+	private function install($update, $updateurl)
 	{
 		$app = JFactory::getApplication();
 
@@ -448,6 +449,22 @@ private function install($update)
 		$installer = JInstaller::getInstance();
 		$update->set('type', $package['type']);
 
+		// Check the package
+		$check = JInstallerHelper::isChecksumValid($package['packagefile'], (string) $updateurl);
+
+		switch ($check)
+		{
+			case 0:
+				$app->enqueueMessage(\JText::_('COM_INSTALLER_INSTALL_CHECKSUM_WRONG'), 'warning');
+				break;
+			case 1:
+				$app->enqueueMessage(\JText::_('COM_INSTALLER_INSTALL_CHECKSUM_CORRECT'), 'message');
+				break;
+			case 2:
+				$app->enqueueMessage(\JText::_('COM_INSTALLER_INSTALL_CHECKSUM_NOT_FOUND'), 'notice');
+				break;
+		}
+
 		// Install the package
 		if (!$installer->update($package['dir']))
 		{

administrator/components/com_joomlaupdate/controllers/update.php

@@ -44,12 +44,28 @@ public function download()
 		$this->_applyCredentials();
 
 		/** @var JoomlaupdateModelDefault $model */
-		$model = $this->getModel('Default');
-		$file = $model->download();
-
-		$message = null;
+		$model       = $this->getModel('Default');
+		$result      = $model->download();
+		$file        = $result['basename'];
+		$message     = null;
 		$messageType = null;
 
+		switch ($result['check'])
+		{
+			case 0:
+				$message = JText::_('COM_JOOMLAUPDATE_VIEW_UPDATE_CHECKSUM_WRONG');
+				$messageType = 'warning';
+				break;
+			case 1:
+				$message = JText::_('COM_JOOMLAUPDATE_VIEW_UPDATE_CHECKSUM_CORRECT');
+				$messageType = 'message';
+				break;
+			case 2:
+				$message = JText::_('COM_JOOMLAUPDATE_VIEW_UPDATE_CHECKSUM_NOT_FOUND');
+				$messageType = 'notice';
+				break;
+		}
+
 		if ($file)
 		{
 			JFactory::getApplication()->setUserState('com_joomlaupdate.file', $file);

administrator/components/com_joomlaupdate/models/default.php

@@ -150,7 +150,8 @@ public function getUpdateInformation()
 			'installed' => JVERSION,
 			'latest'    => null,
 			'object'    => null,
-			'hasUpdate' => false
+			'hasUpdate' => false,
+			'url'       => null
 		);
 
 		// Fetch the update information from the database.
@@ -270,9 +271,10 @@ public function download()
 		}
 
 		// Find the path to the temp directory and the local package.
-		$config  = JFactory::getConfig();
-		$tempdir = $config->get('tmp_path');
-		$target  = $tempdir . '/' . $basename;
+		$config   = JFactory::getConfig();
+		$tempdir  = $config->get('tmp_path');
+		$target   = $tempdir . '/' . $basename;
+		$response = array();
 
 		// Do we have a cached file?
 		$exists = JFile::exists($target);
@@ -289,7 +291,7 @@ public function download()
 				$mirror++;
 			}
 
-			return $download;
+			$response['basename'] = $download;
 		}
 		else
 		{
@@ -307,12 +309,15 @@ public function download()
 					$mirror++;
 				}
 
-				return $download;
+				$response['basename'] = $download;
 			}
 
 			// Yes, it's there, skip downloading.
-			return $basename;
+			$response['basename'] = $basename;
 		}
+
+		$response['check'] = JInstallerHelper::isChecksumValid($target, $updateInfo['url']);
+		return $response;
 	}
 
 	/**

administrator/components/com_media/config.xml

@@ -67,6 +67,7 @@
 			description="COM_MEDIA_FIELD_CHECK_MIME_DESC"
 			class="btn-group btn-group-yesno"
 			default="1"
+			showon="restrict_uploads:1"
 			>
 			<option value="1">JYES</option>
 			<option value="0">JNO</option>
@@ -79,6 +80,7 @@
 			description="COM_MEDIA_FIELD_LEGAL_IMAGE_EXTENSIONS_DESC"
 			size="50"
 			default="bmp,gif,jpg,png"
+			showon="restrict_uploads:1"
 		/>
 
 		<field
@@ -96,6 +98,7 @@
 			description="COM_MEDIA_FIELD_LEGAL_MIME_TYPES_DESC"
 			size="50"
 			default="image/jpeg,image/gif,image/png,image/bmp,application/msword,application/excel,application/pdf,application/powerpoint,text/plain,application/x-zip"
+			showon="restrict_uploads:1"
 		/>
 
 		<field
@@ -105,7 +108,8 @@
 			description="COM_MEDIA_FIELD_ILLEGAL_MIME_TYPES_DESC"
 			size="50"
 			default="text/html"
-		 />
+			showon="restrict_uploads:1"
+		/>
 	</fieldset>
 
 	<fieldset

administrator/components/com_modules/views/modules/tmpl/modal.php

@@ -95,7 +95,7 @@
 						<span class="<?php echo $iconStates[$this->escape($item->published)]; ?>" aria-hidden="true"></span>
 					</td>
 					<td class="has-context">
-						<a class="js-module-insert btn btn-small btn-block btn-success" href="#" data-module="<?php echo $this->escape($item->module); ?>" data-title="<?php echo $this->escape($item->title); ?>" data-editor="<?php echo $this->escape($editor); ?>">
+						<a class="js-module-insert btn btn-small btn-block btn-success" href="#" data-module="<?php echo $item->id; ?>" data-editor="<?php echo $this->escape($editor); ?>">
 							<?php echo $this->escape($item->title); ?>
 						</a>
 					</td>

administrator/components/com_users/views/groups/tmpl/default.php

@@ -68,12 +68,14 @@
 							<?php echo JHtml::_('searchtools.sort', 'COM_USERS_HEADING_GROUP_TITLE', 'a.title', $listDirn, $listOrder); ?>
 						</th>
 						<th width="1%" class="nowrap center">
-							<span class="icon-publish hasTooltip" aria-hidden="true" title="<?php echo JText::_('COM_USERS_COUNT_ENABLED_USERS'); ?>"></span>
-							<span class="hidden-phone"><?php echo JText::_('COM_USERS_COUNT_ENABLED_USERS'); ?></span>
+							<span class="icon-publish hasTooltip" aria-hidden="true" title="<?php echo JText::_('COM_USERS_COUNT_ENABLED_USERS'); ?>">
+								<span class="element-invisible"><?php echo JText::_('COM_USERS_COUNT_ENABLED_USERS'); ?></span>
+							</span>
 						</th>
 						<th width="1%" class="nowrap center">
-							<span class="icon-unpublish hasTooltip" aria-hidden="true" title="<?php echo JText::_('COM_USERS_COUNT_DISABLED_USERS'); ?>"></span>
-							<span class="hidden-phone"><?php echo JText::_('COM_USERS_COUNT_DISABLED_USERS'); ?></span>
+							<span class="icon-unpublish hasTooltip" aria-hidden="true" title="<?php echo JText::_('COM_USERS_COUNT_DISABLED_USERS'); ?>">
+								<span class="element-invisible"><?php echo JText::_('COM_USERS_COUNT_DISABLED_USERS'); ?></span>
+							</span>
 						</th>
 						<th width="1%" class="nowrap hidden-phone">
 							<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_ID', 'a.id', $listDirn, $listOrder); ?>

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

@@ -118,7 +118,7 @@ COM_CONTENT_FIELDS_TYPE_MODAL_ARTICLE="Article"
 COM_CONTENT_FIELDSET_PUBLISHING="Publishing"
 COM_CONTENT_FIELDSET_RULES="Permissions"
 COM_CONTENT_FIELDSET_URLS_AND_IMAGES="Images and Links"
-COM_CONTENT_FILTER_SEARCH_DESC="Search in title and alias. Prefix with ID: or AUTHOR: to search for an article ID or article author."
+COM_CONTENT_FILTER_SEARCH_DESC="Search in title and alias. Prefix with ID: or AUTHOR: or CONTENT: to search for an article ID, article author or search in article content."
 COM_CONTENT_FILTER_SEARCH_LABEL="Search Articles"
 COM_CONTENT_FLOAT_DESC="Controls placement of the image."
 COM_CONTENT_FLOAT_FULLTEXT_LABEL="Full Text Image Float"

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

@@ -64,6 +64,9 @@ COM_INSTALLER_HEADING_UPDATESITE_NAME_ASC="Update Site ascending"
 COM_INSTALLER_HEADING_UPDATESITE_NAME_DESC="Update Site descending"
 COM_INSTALLER_HEADING_UPDATESITEID="ID"
 COM_INSTALLER_INSTALL_BUTTON="Install"
+COM_INSTALLER_INSTALL_CHECKSUM_CORRECT="File Checksum OK"
+COM_INSTALLER_INSTALL_CHECKSUM_NOT_FOUND="There were no checksums provided in the package."
+COM_INSTALLER_INSTALL_CHECKSUM_WRONG="File Checksum Failed"
 COM_INSTALLER_INSTALL_DIRECTORY="Install Folder"
 COM_INSTALLER_INSTALL_ERROR="Error installing %s"
 COM_INSTALLER_INSTALL_FROM_DIRECTORY="Install from Folder"

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

@@ -68,6 +68,9 @@ COM_JOOMLAUPDATE_VIEW_DEFAULT_UPLOAD_INTRO="You can use this feature to update J
 COM_JOOMLAUPDATE_VIEW_PROGRESS="Update progress"
 COM_JOOMLAUPDATE_VIEW_UPDATE_BYTESEXTRACTED="Bytes extracted"
 COM_JOOMLAUPDATE_VIEW_UPDATE_BYTESREAD="Bytes read"
+COM_JOOMLAUPDATE_VIEW_UPDATE_CHECKSUM_CORRECT="File Checksum OK"
+COM_JOOMLAUPDATE_VIEW_UPDATE_CHECKSUM_NOT_FOUND="There were no checksums provided in the package."
+COM_JOOMLAUPDATE_VIEW_UPDATE_CHECKSUM_WRONG="File Checksum Failed"
 COM_JOOMLAUPDATE_VIEW_UPDATE_DOWNLOADFAILED="Download of update package failed."
 COM_JOOMLAUPDATE_VIEW_UPDATE_FILESEXTRACTED="Files extracted"
 COM_JOOMLAUPDATE_VIEW_UPDATE_FINALISE_CONFIRM_AND_CONTINUE="Confirm & Continue"

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

@@ -88,9 +88,10 @@ JINVALID_TOKEN="The most recent request was denied because it had an invalid sec
 JINVALID_TOKEN_NOTICE="The security token did not match. The request was aborted to prevent any security breach. Please try again."
 JLOGIN="Log in"
 JLOGOUT="Log out"
-JMONTH="Month"
 JMENU_MULTILANG_WARNING_MISSING_MODULES="An administrator menu module for <strong>%s</strong> does not exist. <br>Create a custom administrator menu and module for each administrator language or publish a menu module set to All languages."
 JMODIFY="Modify"
+JMONTH="Month"
+JMONTH_PUBLISHED="Month (published)"
 JNEVER="Never"
 JNEXT="Next"
 JNEXT_TITLE="Next article: %s"

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

@@ -337,6 +337,7 @@ JLIB_FORM_VALUE_CACHE_REDIS="Redis"
 JLIB_FORM_VALUE_CACHE_WINCACHE="Windows Cache"
 JLIB_FORM_VALUE_CACHE_XCACHE="XCache"
 JLIB_FORM_VALUE_SESSION_APC="Alternative PHP Cache"
+JLIB_FORM_VALUE_SESSION_APCU="APC User Cache"
 JLIB_FORM_VALUE_SESSION_DATABASE="Database"
 JLIB_FORM_VALUE_SESSION_EACCELERATOR="eAccelerator"
 JLIB_FORM_VALUE_SESSION_MEMCACHE="Memcache"

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

@@ -7,10 +7,14 @@ MOD_FEED="Feed Display"
 MOD_FEED_ERR_CACHE="Please make cache folder writable."
 MOD_FEED_ERR_NO_URL="No feed URL specified."
 MOD_FEED_ERR_FEED_NOT_RETRIEVED="Feed not found."
+MOD_FEED_FIELD_DATE_DESC="Show the publication date of the feed."
+MOD_FEED_FIELD_DATE_LABEL="Feed Date"
 MOD_FEED_FIELD_DESCRIPTION_DESC="Show the description text for the whole Feed."
 MOD_FEED_FIELD_DESCRIPTION_LABEL="Feed Description"
 MOD_FEED_FIELD_IMAGE_DESC="Show the image associated with the whole feed."
 MOD_FEED_FIELD_IMAGE_LABEL="Feed Image"
+MOD_FEED_FIELD_ITEMDATE_DESC="Show the publication date of individual RSS Items."
+MOD_FEED_FIELD_ITEMDATE_LABEL="Publication Date"
 MOD_FEED_FIELD_ITEMDESCRIPTION_DESC="Show the Description or Intro text of individual RSS Items."
 MOD_FEED_FIELD_ITEMDESCRIPTION_LABEL="Item Description"
 MOD_FEED_FIELD_ITEMS_DESC="Enter number of RSS items to display."

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

@@ -11,6 +11,7 @@ PLG_CODEMIRROR_FIELD_AUTOCLOSEBRACKET_DESC="Automatic bracket completion."
 PLG_CODEMIRROR_FIELD_AUTOCLOSEBRACKET_LABEL="Bracket Completion"
 PLG_CODEMIRROR_FIELD_AUTOCLOSETAGS_DESC="Automatic tag completion."
 PLG_CODEMIRROR_FIELD_AUTOCLOSETAGS_LABEL="Tag Completion"
+; The following two strings are deprecated and will be removed in J4
 PLG_CODEMIRROR_FIELD_AUTOFOCUS_DESC="Auto focus."
 PLG_CODEMIRROR_FIELD_AUTOFOCUS_LABEL="Auto Focus"
 PLG_CODEMIRROR_FIELD_CODEFOLDING_DESC="Allow blocks of code to be folded."
@@ -42,6 +43,8 @@ PLG_CODEMIRROR_FIELD_MATCHBRACKETS_DESC="Highlight matching brackets."
 PLG_CODEMIRROR_FIELD_MATCHBRACKETS_LABEL="Match Brackets"
 PLG_CODEMIRROR_FIELD_MATCHTAGS_DESC="Highlight matching tags."
 PLG_CODEMIRROR_FIELD_MATCHTAGS_LABEL="Match Tags"
+PLG_CODEMIRROR_FIELD_PREVIEW_DESC="An example of what your CodeMirror editor fields will look like with the current settings (save to update)."
+PLG_CODEMIRROR_FIELD_PREVIEW_LABEL="Preview"
 PLG_CODEMIRROR_FIELD_SELECTIONMATCHES_DESC="Highlight instances of the selected word throughout the document."
 PLG_CODEMIRROR_FIELD_SELECTIONMATCHES_LABEL="Highlight Selection Matches"
 PLG_CODEMIRROR_FIELD_THEME_DESC="Sets the colours for the editor."

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.8.8</version>
-	<creationDate>April 2018</creationDate>
+	<version>3.9.0</version>
+	<creationDate>May 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.8.8</version>
-	<creationDate>April 2018</creationDate>
+	<version>3.9.0</version>
+	<creationDate>May 2018</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>