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

administrator/components/com_admin/script.php

@@ -1597,30 +1597,30 @@ public function deleteUnexistingFiles()
 			'/administrator/components/com_admin/postinstall/phpversion.php',
 			'/components/com_content/layouts/field/prepare/modal_article.php',
 			// Joomla 3.8.0
+			'/administrator/components/com_content/models/fields/votelist.php',
+			'/administrator/modules/mod_menu/preset/disabled.php',
+			'/administrator/modules/mod_menu/preset/enabled.php',
 			'/libraries/cms/application/administrator.php',
 			'/libraries/cms/application/cms.php',
 			'/libraries/cms/application/helper.php',
 			'/libraries/cms/application/site.php',
 			'/libraries/cms/authentication/helper.php',
 			'/libraries/cms/captcha/captcha.php',
+			'/libraries/cms/component/exception/missing.php',
 			'/libraries/cms/component/helper.php',
 			'/libraries/cms/component/record.php',
-			'/libraries/cms/component/exception/missing.php',
+			'/libraries/cms/component/router/base.php',
+			'/libraries/cms/component/router/interface.php',
+			'/libraries/cms/component/router/legacy.php',
 			'/libraries/cms/component/router/rules/interface.php',
 			'/libraries/cms/component/router/rules/menu.php',
 			'/libraries/cms/component/router/rules/nomenu.php',
 			'/libraries/cms/component/router/rules/standard.php',
-			'/libraries/cms/component/router/base.php',
-			'/libraries/cms/component/router/interface.php',
-			'/libraries/cms/component/router/legacy.php',
 			'/libraries/cms/component/router/view.php',
 			'/libraries/cms/component/router/viewconfiguration.php',
 			'/libraries/cms/editor/editor.php',
 			'/libraries/cms/error/page.php',
 			'/libraries/cms/extension/helper.php',
-			'/libraries/cms/filter/input.php',
-			'/libraries/cms/filter/output.php',
-			'/libraries/cms/filter/wrapper/output.php',
 			'/libraries/cms/form/field/author.php',
 			'/libraries/cms/form/field/captcha.php',
 			'/libraries/cms/form/field/chromestyle.php',
@@ -1629,7 +1629,7 @@ public function deleteUnexistingFiles()
 			'/libraries/cms/form/field/contenttype.php',
 			'/libraries/cms/form/field/editor.php',
 			'/libraries/cms/form/field/frontend_language.php',
-			'/libraries/cms/form/field/headertab.php',
+			'/libraries/cms/form/field/headertag.php',
 			'/libraries/cms/form/field/helpsite.php',
 			'/libraries/cms/form/field/lastvisitdaterange.php',
 			'/libraries/cms/form/field/limitbox.php',
@@ -1645,8 +1645,8 @@ public function deleteUnexistingFiles()
 			'/libraries/cms/form/field/status.php',
 			'/libraries/cms/form/field/tag.php',
 			'/libraries/cms/form/field/templatestyle.php',
-			'/libraries/cms/form/field/useractive.php',
 			'/libraries/cms/form/field/user.php',
+			'/libraries/cms/form/field/useractive.php',
 			'/libraries/cms/form/field/usergrouplist.php',
 			'/libraries/cms/form/field/userstate.php',
 			'/libraries/cms/form/rule/captcha.php',
@@ -1662,11 +1662,6 @@ public function deleteUnexistingFiles()
 			'/libraries/cms/helper/usergroups.php',
 			'/libraries/cms/html/html.php',
 			'/libraries/cms/installer/adapter.php',
-			'/libraries/cms/installer/extension.php',
-			'/libraries/cms/installer/helper.php',
-			'/libraries/cms/installer/installer.php',
-			'/libraries/cms/installer/manifest.php',
-			'/libraries/cms/installer/script.php',
 			'/libraries/cms/installer/adapter/component.php',
 			'/libraries/cms/installer/adapter/file.php',
 			'/libraries/cms/installer/adapter/language.php',
@@ -1675,8 +1670,14 @@ public function deleteUnexistingFiles()
 			'/libraries/cms/installer/adapter/package.php',
 			'/libraries/cms/installer/adapter/plugin.php',
 			'/libraries/cms/installer/adapter/template.php',
+			'/libraries/cms/installer/extension.php',
+			'/libraries/cms/installer/helper.php',
+			'/libraries/cms/installer/installer.php',
+			'/libraries/cms/installer/manifest.php',
 			'/libraries/cms/installer/manifest/library.php',
 			'/libraries/cms/installer/manifest/package.php',
+			'/libraries/cms/installer/script.php',
+			'/libraries/cms/language/associations.php',
 			'/libraries/cms/language/multilang.php',
 			'/libraries/cms/layout/base.php',
 			'/libraries/cms/layout/file.php',
@@ -1721,6 +1722,7 @@ public function deleteUnexistingFiles()
 			'/libraries/cms/ucm/base.php',
 			'/libraries/cms/ucm/content.php',
 			'/libraries/cms/ucm/type.php',
+			'/libraries/cms/ucm/ucm.php',
 			'/libraries/cms/version/version.php',
 			'/libraries/joomla/access/access.php',
 			'/libraries/joomla/access/exception/notallowed.php',
@@ -1730,6 +1732,7 @@ public function deleteUnexistingFiles()
 			'/libraries/joomla/application/base.php',
 			'/libraries/joomla/application/cli.php',
 			'/libraries/joomla/application/daemon.php',
+			'/libraries/joomla/application/route.php',
 			'/libraries/joomla/application/web.php',
 			'/libraries/joomla/association/extension/helper.php',
 			'/libraries/joomla/association/extension/interface.php',
@@ -1837,6 +1840,7 @@ public function deleteUnexistingFiles()
 			'/libraries/joomla/http/transport/socket.php',
 			'/libraries/joomla/http/transport/stream.php',
 			'/libraries/joomla/http/wrapper/factory.php',
+			'/libraries/joomla/image/filter.php',
 			'/libraries/joomla/image/filter/backgroundfill.php',
 			'/libraries/joomla/image/filter/brightness.php',
 			'/libraries/joomla/image/filter/contrast.php',
@@ -1846,7 +1850,6 @@ public function deleteUnexistingFiles()
 			'/libraries/joomla/image/filter/negate.php',
 			'/libraries/joomla/image/filter/sketchy.php',
 			'/libraries/joomla/image/filter/smooth.php',
-			'/libraries/joomla/image/filter.php',
 			'/libraries/joomla/image/image.php',
 			'/libraries/joomla/input/cli.php',
 			'/libraries/joomla/input/cookie.php',
@@ -1857,6 +1860,7 @@ public function deleteUnexistingFiles()
 			'/libraries/joomla/language/language.php',
 			'/libraries/joomla/language/stemmer.php',
 			'/libraries/joomla/language/stemmer/porteren.php',
+			'/libraries/joomla/language/text.php',
 			'/libraries/joomla/language/transliterate.php',
 			'/libraries/joomla/language/wrapper/helper.php',
 			'/libraries/joomla/language/wrapper/text.php',
@@ -1931,8 +1935,6 @@ public function deleteUnexistingFiles()
 			'/libraries/legacy/view/legacy.php',
 			'/libraries/legacy/web/client.php',
 			'/libraries/legacy/web/web.php',
-			'/administrator/modules/mod_menu/preset/enabled.php',
-			'/administrator/modules/mod_menu/preset/disabled.php',
 		);
 
 		// TODO There is an issue while deleting folders using the ftp mode
@@ -2065,6 +2067,7 @@ public function deleteUnexistingFiles()
 			// Joomla! 3.7.4
 			'/components/com_fields/controllers',
 			// Joomla! 3.8.0
+			'/administrator/modules/mod_menu/preset',
 			'/libraries/cms/application',
 			'/libraries/cms/authentication',
 			'/libraries/cms/captcha',
@@ -2141,6 +2144,7 @@ public function deleteUnexistingFiles()
 			'/libraries/joomla/input',
 			'/libraries/joomla/language/stemmer',
 			'/libraries/joomla/language/wrapper',
+			'/libraries/joomla/language',
 			'/libraries/joomla/log/logger',
 			'/libraries/joomla/log',
 			'/libraries/joomla/mail/language',
@@ -2164,7 +2168,6 @@ public function deleteUnexistingFiles()
 			'/libraries/legacy/view',
 			'/libraries/legacy/web',
 			'/media/editors/tinymce/plugins/jdragdrop',
-			'/administrator/modules/mod_menu/preset',
 		);
 
 		jimport('joomla.filesystem.file');

administrator/components/com_admin/views/help/tmpl/langforum.php

@@ -9,7 +9,15 @@
 
 defined('_JEXEC') or die;
 
-$forumId   = (int) JText::_('COM_ADMIN_HELP_SUPPORT_OFFICIAL_LANGUAGE_FORUM_VALUE');
+JFactory::getLanguage()->load('mod_menu', JPATH_ADMINISTRATOR, null, false, true);
+
+$forumId   = (int) JText::_('MOD_MENU_HELP_SUPPORT_OFFICIAL_LANGUAGE_FORUM_VALUE');
+
+if (empty($forumId))
+{
+	$forumId = 511;
+}
+
 $forum_url = 'https://forum.joomla.org/viewforum.php?f=' . $forumId;
 
 JFactory::getApplication()->redirect($forum_url);

administrator/components/com_contact/config.xml

@@ -946,7 +946,7 @@
 			type="radio"
 			label="COM_CONTACT_FIELD_EMAIL_EMAIL_COPY_LABEL"
 			description="COM_CONTACT_FIELD_EMAIL_EMAIL_COPY_DESC"
-			default="1"
+			default="0"
 			class="btn-group btn-group-yesno"
 			showon="show_email_form:1"
 			>

administrator/components/com_users/helpers/users.php

@@ -54,32 +54,33 @@ public static function addSubmenu($vName)
 				'index.php?option=com_users&view=levels',
 				$vName == 'levels'
 			);
+		}
 
-			if (JComponentHelper::isEnabled('com_fields') && JComponentHelper::getParams('com_users')->get('custom_fields_enable', '1'))
-			{
-				JHtmlSidebar::addEntry(
-					JText::_('JGLOBAL_FIELDS'),
-					'index.php?option=com_fields&context=com_users.user',
-					$vName == 'fields.fields'
-				);
-				JHtmlSidebar::addEntry(
-					JText::_('JGLOBAL_FIELD_GROUPS'),
-					'index.php?option=com_fields&view=groups&context=com_users.user',
-					$vName == 'fields.groups'
-				);
-			}
-
+		if (JComponentHelper::isEnabled('com_fields') && JComponentHelper::getParams('com_users')->get('custom_fields_enable', '1'))
+		{
 			JHtmlSidebar::addEntry(
-				JText::_('COM_USERS_SUBMENU_NOTES'),
-				'index.php?option=com_users&view=notes',
-				$vName == 'notes'
+				JText::_('JGLOBAL_FIELDS'),
+				'index.php?option=com_fields&context=com_users.user',
+				$vName == 'fields.fields'
 			);
 			JHtmlSidebar::addEntry(
-				JText::_('COM_USERS_SUBMENU_NOTE_CATEGORIES'),
-				'index.php?option=com_categories&extension=com_users',
-				$vName == 'categories'
+				JText::_('JGLOBAL_FIELD_GROUPS'),
+				'index.php?option=com_fields&view=groups&context=com_users.user',
+				$vName == 'fields.groups'
 			);
 		}
+
+		JHtmlSidebar::addEntry(
+			JText::_('COM_USERS_SUBMENU_NOTES'),
+			'index.php?option=com_users&view=notes',
+			$vName == 'notes'
+		);
+
+		JHtmlSidebar::addEntry(
+			JText::_('COM_USERS_SUBMENU_NOTE_CATEGORIES'),
+			'index.php?option=com_categories&extension=com_users',
+			$vName == 'categories'
+		);
 	}
 
 	/**

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

@@ -99,7 +99,6 @@ COM_ADMIN_HELP_SITE_MAINTENANCE_GLOBAL_CHECK-IN="Global Check-in"
 COM_ADMIN_HELP_SITE_MAINTENANCE_PURGE_EXPIRED_CACHE="Cache: Clear Expired Cache"
 COM_ADMIN_HELP_SITE_SYSTEM_INFORMATION="System Information"
 COM_ADMIN_HELP_START_HERE="Start Here"
-COM_ADMIN_HELP_SUPPORT_OFFICIAL_LANGUAGE_FORUM_VALUE="511"
 COM_ADMIN_HELP_USERS_ACCESS_LEVELS="Users: Access Levels"
 COM_ADMIN_HELP_USERS_ACCESS_LEVELS_EDIT="Users: Access Levels - New/Edit"
 COM_ADMIN_HELP_USERS_DEBUG_USER="Users: Debug Users Permissions"

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

@@ -275,6 +275,8 @@ COM_CONTACT_N_ITEMS_CHECKED_IN_1="%d contact checked in."
 COM_CONTACT_N_ITEMS_CHECKED_IN_MORE="%d contacts checked in."
 COM_CONTACT_N_ITEMS_DELETED="%d contacts deleted."
 COM_CONTACT_N_ITEMS_DELETED_1="%d contact deleted."
+COM_CONTACT_N_ITEMS_FEATURED="%d contacts featured."
+COM_CONTACT_N_ITEMS_FEATURED_1="%d contact featured."
 COM_CONTACT_N_ITEMS_PUBLISHED="%d contacts published."
 COM_CONTACT_N_ITEMS_PUBLISHED_1="%d contact published."
 COM_CONTACT_N_ITEMS_TRASHED="%d contacts trashed."

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

@@ -66,8 +66,10 @@ MOD_MENU_HELP_SHOP="Joomla! Shop"
 MOD_MENU_HELP_SUPPORT_OFFICIAL_FORUM="Official Support Forum"
 ; the string below will be used if the localised sample data contains a URL for the desired community forum or if the 'Custom Support Forum' field parameter in the Administrator Menu module contains a URL
 MOD_MENU_HELP_SUPPORT_CUSTOM_FORUM="Custom Support Forum"
-; The string below will be used if MOD_MENU_HELP_SUPPORT_OFFICIAL_LANGUAGE_FORUM_VALUE has a value, i.e the # of the specific language forum in https://forum.joomla.org/. Use something like 'Official english forum'.
+; Enter in the string below the # of the specific language forum in https://forum.joomla.org/ (example: 19 for French). If left empty, it will use '511' which is the section for all languages forums.
 MOD_MENU_HELP_SUPPORT_OFFICIAL_LANGUAGE_FORUM_VALUE=""
+; If you have chosen to display in the string above the section for all languages, just translate the string below. 
+; If you have displayed the specific language forum, use something like "Official French Forum" in your language. 
 MOD_MENU_HELP_SUPPORT_OFFICIAL_LANGUAGE_FORUM="Official Language Forums"
 MOD_MENU_HELP_TRANSLATIONS="Joomla! Translations"
 MOD_MENU_HELP_XCHANGE="Stack Exchange"

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

@@ -19,7 +19,7 @@ PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_3_FULLTEXT="<p>On the full page y
 PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_3_INTROTEXT="<p>Your home page is set to display the four most recent articles from the blog category in a column. Then there are links to the 4 next oldest articles. You can change those numbers by editing the content options settings in the blog tab in your site administrator. There is a link to your site administrator in the top menu.</p><p>If you want to have your blog post broken into two parts, an introduction and then a full length separate page, use the Read More button to insert a break.</p>"
 PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_3_TITLE="About your home page"
 PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_4_FULLTEXT=""
-PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_4_INTROTEXT="<p>Your site has some commonly used modules already preconfigured. These include:</p><ul><li>Image Module which holds the image beneath the menu. This is a Custom module that you can edit to change the image.</li><li>Blog Roll. which lets you link to other blogs. We've put in two examples, but you'll want to change them. When you are logged in, click on blog roll on the top menu to update this.</li><li>Most Read Posts which lists articles based on the number of times they have been read.</li><li>Older Articles which lists out articles by month.</li><li>Syndicate which allows your readers to read your posts in a news reader.</li><li>Popular Tags, which will appear if you use tagging on your articles. Just enter a tag in the Tags field when editing.</li></ul><p>Each of these modules has many options which you can experiment with in the Module Manager in your site Administrator. Moving your mouse over a module and clicking on the edit icon will take you to an edit screen for that module. Always be sure to save and close any module you edit.</p><p>Joomla! also includes many other modules you can incorporate in your site. As you develop your site you may want to add more module that you can find at the <a href='https://extensions.joomla.org/'>Joomla Extensions Directory.</a></p>"
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_4_INTROTEXT="<p>Your site has some commonly used modules already preconfigured. These include:</p><ul><li>Image Module which holds the image beneath the menu. This is a Custom module that you can edit to change the image.</li><li>Most Read Posts which lists articles based on the number of times they have been read.</li><li>Older Articles which lists out articles by month.</li><li>Syndicate which allows your readers to read your posts in a news reader.</li><li>Popular Tags, which will appear if you use tagging on your articles. Just enter a tag in the Tags field when editing.</li></ul><p>Each of these modules has many options which you can experiment with in the Module Manager in your site Administrator. Moving your mouse over a module and clicking on the edit icon will take you to an edit screen for that module. Always be sure to save and close any module you edit.</p><p>Joomla! also includes many other modules you can incorporate in your site. As you develop your site you may want to add more module that you can find at the <a href='https://extensions.joomla.org/'>Joomla Extensions Directory.</a></p>"
 PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_4_TITLE="Your Modules"
 PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_5_FULLTEXT=""
 PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_5_INTROTEXT="<p>Templates control the look and feel of your website.</p><p>This blog is installed with the Protostar template.</p><p>You can edit the options by clicking on the Working on Your Site, Template Settings link in the top menu (visible when you login).</p><p>For example you can change the site background color, highlights color, site title, site description and title font used.</p><p>More options are available in the site administrator. You may also install a new template using the extension manager.</p>"

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

@@ -2,7 +2,7 @@
 <metafile version="3.7" client="administrator">
 	<name>English (en-GB)</name>
 	<version>3.8.0</version>
-	<creationDate>August 2017</creationDate>
+	<creationDate>September 2017</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.8.0</version>
-	<creationDate>August 2017</creationDate>
+	<creationDate>September 2017</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 - 2017 Open Source Matters. All rights reserved</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
-	<version>3.8.0-beta5-dev</version>
-	<creationDate>August 2017</creationDate>
+	<version>3.8.0-rc2-dev</version>
+	<creationDate>September 2017</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.8.0.1</version>
-	<creationDate>August 2017</creationDate>
+	<creationDate>September 2017</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>

build/.gitignore

@@ -7,3 +7,6 @@
 # Ignore the folder the build script creates for packages
 /tmp
 /com_joomlaupdate-pkg
+
+# Ignore the deleted file script output
+/deleted_files.txt