Merge branch 'staging' into 3.8-dev

administrator/components/com_admin/postinstall/joomla40checks.php

@@ -38,13 +38,18 @@ function admin_postinstall_joomla40checks_condition()
 		return true;
 	}
 
-
 	if ($serverType == 'mysql' && version_compare($serverVersion, '5.5.3', 'lt'))
 	{
 		// MySQL minimum version is 5.5.3
 		return true;
 	}
 
+	if ($db->name === 'mysql')
+	{
+		// Using deprecated MySQL driver
+		return true;
+	}
+
 	// PHP minimum version is 5.5
 	return version_compare(PHP_VERSION, '5.5.9', 'lt');
 }

administrator/components/com_admin/sql/updates/sqlazure/3.7.0-2016-08-29.sql

@@ -1,4 +1,4 @@
-/****** Object:  Table [#__fields] ******/
+/****** Object:  Table [#__fields] ******/
 
 SET QUOTED_IDENTIFIER ON;
 
@@ -52,15 +52,15 @@ CREATE NONCLUSTERED INDEX [idx_language] ON [#__fields](
 	[language] ASC)
 WITH (STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF);
 
-/****** Object:  Table [#__fields_categories] ******/
+/****** Object:  Table [#__fields_categories] ******/
 
 SET QUOTED_IDENTIFIER ON;
 
-CREATE TABLE [#__fields_categories] ( 
-	[field_id] [int] NOT NULL DEFAULT 0,   
-	[category_id] [int] NOT NULL DEFAULT 0,   
+CREATE TABLE [#__fields_categories] (
+	[field_id] [int] NOT NULL DEFAULT 0,
+	[category_id] [int] NOT NULL DEFAULT 0,
 CONSTRAINT [PK_#__fields_categories_id] PRIMARY KEY CLUSTERED(
-	[field_id] ASC, 
+	[field_id] ASC,
 	[category_id] ASC)
 WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON
 ) ON [PRIMARY]) ON [PRIMARY];
@@ -115,7 +115,7 @@ CREATE NONCLUSTERED INDEX [idx_language] ON [#__fields_groups](
 	[language] ASC)
 WITH (STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF);
 
-/****** Object:  Table [#__fields_values] ******/
+/****** Object:  Table [#__fields_values] ******/
 
 SET QUOTED_IDENTIFIER ON;
 
@@ -138,12 +138,12 @@ CREATE NONCLUSTERED INDEX [idx_item_id] ON [#__fields_values](
 	[item_id] ASC)
 WITH (STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF);
 
-SET IDENTITY_INSERT [#__extensions] ON;
+SET IDENTITY_INSERT [#__extensions] ON;
 
 INSERT INTO [#__extensions] ([extension_id], [name], [type], [element], [folder], [client_id], [enabled], [access], [protected], [manifest_cache], [params], [custom_data], [system_data], [checked_out], [checked_out_time], [ordering], [state])
 SELECT 33, 'com_fields', 'component', 'com_fields', '', 1, 1, 1, 0, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0
 UNION ALL
 SELECT 461, 'plg_system_fields', 'plugin', 'fields', 'system', 0, 1, 1, 0, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0
 
 
-SET IDENTITY_INSERT [#__extensions] OFF; 
+SET IDENTITY_INSERT [#__extensions] OFF;

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

@@ -22,7 +22,7 @@ COM_CPANEL_MSG_EACCELERATOR_TITLE="eAccelerator is not compatible with Joomla!"
 COM_CPANEL_MSG_HTACCESS_BODY="A change to the default .htaccess and web.config files was made in Joomla! 3.4 to disallow folder listings by default.  Users are recommended to implement this change in their files.  Please see <a href="_QQ_"https://docs.joomla.org/Preconfigured_htaccess"_QQ_">this page</a> for more information."
 COM_CPANEL_MSG_HTACCESS_TITLE=".htaccess & web.config Update"
 COM_CPANEL_MSG_JOOMLA40_PRE_CHECKS_TITLE="Prepare for the next Major Release of Joomla"
-COM_CPANEL_MSG_JOOMLA40_PRE_CHECKS_BODY="Beginning with Joomla! 4.0 we are raising the minimum server requirements. If you are seeing this message then your current configuration does not meet these new minimum requirements.<br>The <a href="_QQ_"https://developer.joomla.org/news/658-joomla4-manifesto.html"_QQ_"><strong>minimum</strong> requirements</a> are the following: <ul><li>PHP 5.5.9</li><li>MySQL 5.5.3</li><li>PostgreSQL 9.2</li><li>MS SQL will <strong>not</strong> be supported</li></ul><br>Please contact your hosting provider to ask how you can meet these raised server requirements - it is usually a very simple change. If you already meet these new requirements then this message will not be displayed."
+COM_CPANEL_MSG_JOOMLA40_PRE_CHECKS_BODY="Beginning with Joomla! 4.0 we are raising the minimum server requirements. If you are seeing this message then your current configuration does not meet these new minimum requirements.<br>The <a href="_QQ_"https://developer.joomla.org/news/658-joomla4-manifesto.html"_QQ_"><strong>minimum</strong> requirements</a> are the following: <ul><li>PHP 5.5.9</li><li>MySQL 5.5.3</li><li>PostgreSQL 9.2</li><li>MS SQL will <strong>not</strong> be supported</li><li>MySQL using the legacy `ext/mysql` PHP extension will <strong>not</strong> be supported, MySQLi or PDO MySQL must be used instead</li></ul><br>Please contact your hosting provider to ask how you can meet these raised server requirements - it is usually a very simple change. If you already meet these new requirements then this message will not be displayed."
 COM_CPANEL_MSG_LANGUAGEACCESS340_TITLE="You have possible issues with your multilingual settings"
 COM_CPANEL_MSG_LANGUAGEACCESS340_BODY="Since Joomla! 3.4.0 you may have issues with the System - Language Filter plugin on your website. To fix them please open the <a href="_QQ_"index.php?option=com_languages&view=languages"_QQ_">Language Manager</a> and save each content language manually to make sure an Access level is saved."
 COM_CPANEL_MSG_PHPVERSION_BODY="Beginning with Joomla! 3.3, the version of PHP this site is using will no longer be supported. Joomla! 3.3 will require at least <a href="_QQ_"https://community.joomla.org/blogs/leadership/1798-raising-the-bar-on-security.html"_QQ_">PHP version 5.3.10 in order to provide enhanced security features to its users</a>."

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

@@ -4,7 +4,6 @@
 ; Note : All ini files need to be saved as UTF-8
 
 COM_FINDER="Smart Search"
-COM_FINDER_XML_DESCRIPTION="Smart Search"
-
 COM_FINDER_MENU_SEARCH_VIEW_DEFAULT_TEXT="The default search layout."
 COM_FINDER_MENU_SEARCH_VIEW_DEFAULT_TITLE="Search"
+COM_FINDER_XML_DESCRIPTION="Smart Search"

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

@@ -4,8 +4,6 @@
 ; Note : All ini files need to be saved as UTF-8
 
 COM_INSTALLER="Installer"
-COM_INSTALLER_XML_DESCRIPTION="Installer component for adding, removing and upgrading extensions."
-
 COM_INSTALLER_DATABASE_VIEW_DEFAULT_DESC="Check and fix any database issues with your website."
 COM_INSTALLER_DATABASE_VIEW_DEFAULT_TITLE="Check Database"
 COM_INSTALLER_DISCOVER_VIEW_DEFAULT_DESC="Discover extensions that have not gone through the normal installation process."
@@ -22,3 +20,4 @@ COM_INSTALLER_UPDATE_VIEW_DEFAULT_DESC="Find and Install updates for the install
 COM_INSTALLER_UPDATE_VIEW_DEFAULT_TITLE="Update Extensions"
 COM_INSTALLER_WARNINGS_VIEW_DEFAULT_DESC="Displays warnings related to your installed extensions."
 COM_INSTALLER_WARNINGS_VIEW_DEFAULT_TITLE="Warnings"
+COM_INSTALLER_XML_DESCRIPTION="Installer component for adding, removing and upgrading extensions."

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

@@ -4,11 +4,10 @@
 ; Note : All ini files need to be saved as UTF-8
 
 COM_LANGUAGES="Languages"
-COM_LANGUAGES_XML_DESCRIPTION="Component for language management."
-
 COM_LANGUAGES_INSTALLED_VIEW_DEFAULT_DESC="Displays language packs installed into your Joomla! website."
 COM_LANGUAGES_INSTALLED_VIEW_DEFAULT_TITLE="Installed Languages"
 COM_LANGUAGES_LANGUAGES_VIEW_DEFAULT_DESC="Create or manage content languages for your Joomla! website."
 COM_LANGUAGES_LANGUAGES_VIEW_DEFAULT_TITLE="Content Languages"
 COM_LANGUAGES_OVERRIDE_VIEW_DEFAULT_DESC="Here you assign custom text for a language key that you want to use instead of language pack default text."
 COM_LANGUAGES_OVERRIDE_VIEW_DEFAULT_TITLE="Language Overrides"
+COM_LANGUAGES_XML_DESCRIPTION="Component for language management."

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

@@ -93,6 +93,9 @@ COM_MEDIA_THUMBNAIL_VIEW="Thumbnail View"
 COM_MEDIA_TITLE="Image Title"
 COM_MEDIA_UPLOAD_COMPLETE="Upload Complete: %s"
 COM_MEDIA_UPLOAD_FILE="Upload file"
+; The following two strings are deprecated with 3.7.0 and will be removed in 4.0
+COM_MEDIA_UPLOAD_FILES="Upload files (Maximum Size: %s MB)"
+COM_MEDIA_UPLOAD_FILES_NOLIMIT="Upload files (No maximum size)"
 COM_MEDIA_UPLOAD_SUCCESSFUL="Upload Successful"
 COM_MEDIA_UPLOAD="Upload"
 COM_MEDIA_UP="Up"

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

@@ -4,7 +4,6 @@
 ; Note : All ini files need to be saved as UTF-8
 
 COM_MEDIA="Media"
-COM_MEDIA_XML_DESCRIPTION="Component for managing site media."
-
 COM_MEDIA_MEDIA_VIEW_DEFAULT_DESC="Upload or manage images and other media files on you Joomla! website."
 COM_MEDIA_MEDIA_VIEW_DEFAULT_TITLE="Media Manager"
+COM_MEDIA_XML_DESCRIPTION="Component for managing site media."

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

@@ -4,8 +4,6 @@
 ; Note : All ini files need to be saved as UTF-8
 
 COM_MENUS="Menus"
-COM_MENUS_XML_DESCRIPTION="Component for creating menus."
-
 COM_MENUS_ITEMS_CHOOSE_MENU_DESC="Choose a Menutype for the target page.<br><br>Not to be confused with the <strong>Menu</strong> under which this menu item will be assigned."
 COM_MENUS_ITEMS_CHOOSE_MENU_LABEL="Choose a Menutype"
 COM_MENUS_ITEMS_VIEW_DEFAULT_DESC="Shows a list of menu items"
@@ -16,3 +14,4 @@ COM_MENUS_MENUS_VIEW_DEFAULT_DESC="Shows a list of Menu Types"
 COM_MENUS_MENUS_VIEW_DEFAULT_TITLE="Menus"
 COM_MENUS_MENU_VIEW_EDIT_DESC="Shows a form to create a new menu"
 COM_MENUS_MENU_VIEW_EDIT_TITLE="New Menu"
+COM_MENUS_XML_DESCRIPTION="Component for creating menus."

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

@@ -1,5 +1,5 @@
-; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved.
 ; Joomla! Project
+; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 

administrator/manifests/files/joomla.xml

@@ -15,7 +15,7 @@
 	<update>
 		<schemas>
 			<schemapath type="mysql">administrator/components/com_admin/sql/updates/mysql</schemapath>
-			<schemapath type="sqlsrv">administrator/components/com_admin/sql/updates/sqlsrv</schemapath>
+			<schemapath type="sqlsrv">administrator/components/com_admin/sql/updates/sqlazure</schemapath>
 			<schemapath type="sqlazure">administrator/components/com_admin/sql/updates/sqlazure</schemapath>
 			<schemapath type="postgresql">administrator/components/com_admin/sql/updates/postgresql</schemapath>
 		</schemas>