Merge branch 'staging' into uneeded-data

administrator/components/com_admin/script.php

@@ -1172,6 +1172,12 @@ public function deleteUnexistingFiles()
 			'/libraries/joomla/registry/format/xml.php',
 			// Joomla 3.3.1
 			'/administrator/templates/isis/html/message.php',
+			// Joomla 3.3.6
+			'/media/editors/tinymce/plugins/compat3x/editable_selects.js',
+			'/media/editors/tinymce/plugins/compat3x/form_utils.js',
+			'/media/editors/tinymce/plugins/compat3x/mctabs.js',
+			'/media/editors/tinymce/plugins/compat3x/tiny_mce_popup.js',
+			'/media/editors/tinymce/plugins/compat3x/validate.js',
 			// Joomla! 3.4
 			'/administrator/components/com_tags/helpers/html/index.html',
 			'/administrator/components/com_tags/models/fields/index.html',
@@ -1278,9 +1284,25 @@ public function deleteUnexistingFiles()
 			'/media/editors/codemirror/js/php.js',
 			'/media/editors/codemirror/js/xml-fold.js',
 			'/media/editors/codemirror/js/xml.js',
+			'/media/editors/tinymce/skins/lightgray/fonts/icomoon.svg',
+			'/media/editors/tinymce/skins/lightgray/fonts/icomoon.ttf',
+			'/media/editors/tinymce/skins/lightgray/fonts/icomoon.woff',
+			'/media/editors/tinymce/skins/lightgray/fonts/icomoon-small.eot',
+			'/media/editors/tinymce/skins/lightgray/fonts/icomoon-small.svg',
+			'/media/editors/tinymce/skins/lightgray/fonts/icomoon-small.ttf',
+			'/media/editors/tinymce/skins/lightgray/fonts/icomoon-small.woff',
+			'/media/editors/tinymce/skins/lightgray/fonts/readme.md',
+			'/media/editors/tinymce/skins/lightgray/fonts/tinymce.dev.svg',
+			'/media/editors/tinymce/skins/lightgray/fonts/tinymce-small.dev.svg',
+			'/media/editors/tinymce/skins/lightgray/img/wline.gif',
+			'/plugins/editors/codemirror/styles.css',
+			'/plugins/editors/codemirror/styles.min.css',
 			// Joomla! 3.4.1
 			'/libraries/joomla/environment/request.php',
 			'/media/editors/tinymce/templates/template_list.js',
+			'/media/editors/codemirror/lib/addons-uncompressed.js',
+			'/media/editors/codemirror/lib/codemirror-uncompressed.css',
+			'/media/editors/codemirror/lib/codemirror-uncompressed.js',
 			'/administrator/help/en-GB/Components_Banners_Banners.html',
 			'/administrator/help/en-GB/Components_Banners_Banners_Edit.html',
 			'/administrator/help/en-GB/Components_Banners_Categories.html',
@@ -1382,6 +1404,29 @@ public function deleteUnexistingFiles()
 			'/administrator/components/com_config/models/forms/index.html',
 			// Joomla 3.4.2
 			'/libraries/composer_autoload.php',
+			'/administrator/templates/hathor/html/com_categories/categories/default_batch.php',
+			'/administrator/templates/hathor/html/com_tags/tags/default_batch.php',
+			'/media/editors/codemirror/mode/clike/scala.html',
+			'/media/editors/codemirror/mode/css/less.html',
+			'/media/editors/codemirror/mode/css/less_test.js',
+			'/media/editors/codemirror/mode/css/scss.html',
+			'/media/editors/codemirror/mode/css/scss_test.js',
+			'/media/editors/codemirror/mode/css/test.js',
+			'/media/editors/codemirror/mode/gfm/test.js',
+			'/media/editors/codemirror/mode/haml/test.js',
+			'/media/editors/codemirror/mode/javascript/json-ld.html',
+			'/media/editors/codemirror/mode/javascript/test.js',
+			'/media/editors/codemirror/mode/javascript/typescript.html',
+			'/media/editors/codemirror/mode/markdown/test.js',
+			'/media/editors/codemirror/mode/php/test.js',
+			'/media/editors/codemirror/mode/ruby/test.js',
+			'/media/editors/codemirror/mode/shell/test.js',
+			'/media/editors/codemirror/mode/slim/test.js',
+			'/media/editors/codemirror/mode/stex/test.js',
+			'/media/editors/codemirror/mode/textile/test.js',
+			'/media/editors/codemirror/mode/verilog/test.js',
+			'/media/editors/codemirror/mode/xml/test.js',
+			'/media/editors/codemirror/mode/xquery/test.js',
 			// Joomla 3.4.3
 			'/libraries/classloader.php',
 			'/libraries/ClassLoader.php',
@@ -1392,6 +1437,17 @@ public function deleteUnexistingFiles()
 			'/media/com_joomlaupdate/encryption.js',
 			'/media/com_joomlaupdate/json2.js',
 			'/media/com_joomlaupdate/update.js',
+			'/media/com_finder/css/finder-rtl.css',
+			'/media/com_finder/css/selectfilter.css',
+			'/media/com_finder/css/sliderfilter.css',
+			'/media/com_finder/js/sliderfilter.js',
+			'/media/editors/codemirror/mode/kotlin/kotlin.js',
+			'/media/editors/codemirror/mode/kotlin/kotlin.min.js',
+			'/media/editors/tinymce/plugins/compat3x/editable_selects.js',
+			'/media/editors/tinymce/plugins/compat3x/form_utils.js',
+			'/media/editors/tinymce/plugins/compat3x/mctabs.js',
+			'/media/editors/tinymce/plugins/compat3x/tiny_mce_popup.js', 
+			'/media/editors/tinymce/plugins/compat3x/validate.js',
 			'/libraries/vendor/symfony/yaml/Symfony/Component/Yaml/Dumper.php',
 			'/libraries/vendor/symfony/yaml/Symfony/Component/Yaml/Escaper.php',
 			'/libraries/vendor/symfony/yaml/Symfony/Component/Yaml/Inline.php',
@@ -1412,8 +1468,13 @@ public function deleteUnexistingFiles()
 			'/libraries/joomla/document/opensearch/opensearch.php',
 			'/libraries/joomla/document/raw/raw.php',
 			'/libraries/joomla/document/xml/xml.php',
+			'/plugins/editors/tinymce/fields/skins.php',
+			'/plugins/user/profile/fields/dob.php',
+			'/plugins/user/profile/fields/tos.php',
 			'/administrator/components/com_installer/views/languages/tmpl/default_filter.php',
 			'/administrator/components/com_joomlaupdate/helpers/download.php',
+			'/administrator/components/com_config/controller/application/refreshhelp.php',
+			'/administrator/components/com_media/models/forms/index.html',
 			// Joomla 3.6.0
 			'/libraries/simplepie/README.txt',
 			'/libraries/simplepie/simplepie.php',
@@ -1427,6 +1488,11 @@ public function deleteUnexistingFiles()
 			'/administrator/templates/isis/js/bootstrap.min.js',
 			'/media/system/js/permissions.min.js',
 			'/libraries/platform.php',
+			'/plugins/user/profile/fields/tos.php',
+			'/libraries/joomla/application/web/client.php',
+			// Joomla! 3.6.1
+			'/libraries/joomla/database/iterator/azure.php',
+			'/media/editors/tinymce/skins/lightgray/fonts/icomoon.eot',
 			// Joomla! 3.6.3
 			'/media/editors/codemirror/mode/jade/jade.js',
 			'/media/editors/codemirror/mode/jade/jade.min.js',
@@ -1484,6 +1550,9 @@ public function deleteUnexistingFiles()
 			'/plugins/user/joomla/postinstall',
 			'/libraries/joomla/registry/format',
 			'/libraries/joomla/registry',
+			// Joomla! 3.3
+			'/plugins/user/profile/fields',
+			'/media/editors/tinymce/plugins/compat3x',
 			// Joomla! 3.4
 			'/administrator/components/com_tags/helpers/html',
 			'/administrator/components/com_tags/models/fields',
@@ -1508,10 +1577,13 @@ public function deleteUnexistingFiles()
 			'/libraries/phpmailer',
 			'/media/editors/codemirror/css',
 			'/media/editors/codemirror/js',
+			'/media/com_banners',
 			// Joomla! 3.4.1
 			'/administrator/components/com_config/views',
 			'/administrator/components/com_config/models/fields',
 			'/administrator/components/com_config/models/forms',
+			// Joomla! 3.4.2
+			'/media/editors/codemirror/mode/smartymixed',
 			// Joomla! 3.5
 			'/libraries/vendor/symfony/yaml/Symfony/Component/Yaml/Exception',
 			'/libraries/vendor/symfony/yaml/Symfony/Component/Yaml',
@@ -1523,6 +1595,11 @@ public function deleteUnexistingFiles()
 			'/libraries/joomla/document/opensearch',
 			'/libraries/joomla/document/raw',
 			'/libraries/joomla/document/xml',
+			'/administrator/components/com_media/models/forms',
+			'/media/editors/codemirror/mode/kotlin',
+			'/media/editors/tinymce/plugins/compat3x',
+			'/plugins/editors/tinymce/fields',
+			'/plugins/user/profile/fields',
 			// Joomla 3.6
 			'/libraries/simplepie/idn',
 			'/libraries/simplepie',

administrator/components/com_installer/models/languages.php

@@ -343,13 +343,18 @@ protected function _getLanguageManifest($uid)
 	 *
 	 * @since   2.5.7
 	 */
-	protected function _getPackageUrl( $remote_manifest )
+	protected function _getPackageUrl($remote_manifest)
 	{
 		$update = new JUpdate;
 		$update->loadFromXml($remote_manifest);
-		$package_url = trim($update->get('downloadurl', false)->_data);
+		$downloadUrlElement = $update->get('downloadurl', false);
 
-		return $package_url;
+		if ($downloadUrlElement === false)
+		{
+			return false;
+		}
+
+		return trim($downloadUrlElement->_data);
 	}
 
 	/**

administrator/components/com_languages/views/languages/tmpl/default.php

@@ -66,7 +66,7 @@
 						<th width="1%" class="nowrap">
 							<?php echo JHtml::_('searchtools.sort', 'COM_LANGUAGES_HEADING_LANG_CODE', 'a.sef', $listDirn, $listOrder); ?>
 						</th>
-						<th width="5%" class="nowrap hidden-phone">
+						<th width="8%" class="nowrap hidden-phone">
 							<?php echo JHtml::_('searchtools.sort', 'COM_LANGUAGES_HEADING_LANG_IMAGE', 'a.image', $listDirn, $listOrder); ?>
 						</th>
 						<th width="5%" class="nowrap hidden-phone">

administrator/components/com_modules/config.xml

@@ -1,32 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
 <config>
-    <fieldset
-        name="modules"
-        label="COM_MODULES_GENERAL">
-            <field
-                name="redirect_edit"
-                type="list"
-                class="advancedSelect"
-                default="site"
-                label="COM_MODULES_REDIRECT_EDIT_LABEL"
-                description="COM_MODULES_REDIRECT_EDIT_DESC">
-            <option value="admin">JADMINISTRATOR</option>
-            <option value="site">JSITE</option>
-        </field>
-    </fieldset>
+	<fieldset
+		name="modules"
+		label="COM_MODULES_GENERAL"
+		description="COM_MODULES_GENERAL_FIELDSET_DESC"
+		>
+		<field
+			name="redirect_edit"
+			type="list"
+			class="advancedSelect"
+			default="site"
+			label="COM_MODULES_REDIRECT_EDIT_LABEL"
+			description="COM_MODULES_REDIRECT_EDIT_DESC"
+			>
+			<option value="admin">JADMINISTRATOR</option>
+			<option value="site">JSITE</option>
+		</field>
+	</fieldset>
 	<fieldset
 		name="permissions"
 		label="JCONFIG_PERMISSIONS_LABEL"
 		description="JCONFIG_PERMISSIONS_DESC"
 		>
-
 		<field
 			name="rules"
 			type="rules"
 			label="JCONFIG_PERMISSIONS_LABEL"
 			filter="rules"
 			validate="rules"
 			component="com_modules"
-			section="component" />
+			section="component"
+		/>
 	</fieldset>
 </config>

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

@@ -141,7 +141,9 @@
 								?>
 							<?php else : ?>
 								<?php // Extension is not enabled, show a message that indicates this. ?>
-								<button class="btn-micro hasTooltip" title="<?php echo JText::_('COM_MODULES_MSG_MANAGE_EXTENSION_DISABLED'); ?>"><i class="icon-ban-circle"></i></button>
+								<button class="btn btn-micro hasTooltip" title="<?php echo JText::_('COM_MODULES_MSG_MANAGE_EXTENSION_DISABLED'); ?>">
+									<i class="icon-ban-circle"></i>
+								</button>
 							<?php endif; ?>
 							</div>
 						</td>

administrator/help/helpsites.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <joshelp>
 	<sites>
-		<site tag="en-GB" url="https://help.joomla.org/proxy/index.php?keyref=Help{major}{minor}:{keyref}">English (GB) - Joomla help wiki</site>
-		<site tag="fr-FR" url="http://help.joomla.fr/3/index.php?option=com_help&amp;keyref=Help{major}{minor}:{keyref}">Français (FR) - Aide de Joomla!</site>
+		<site tag="en-GB" url="https://help.joomla.org/proxy?keyref=Help{major}{minor}:{keyref}&amp;lang={langcode}">English (GB) - Joomla help wiki</site>
+		<site tag="fr-FR" url="https://help.joomla.fr/index.php?option=com_help&amp;keyref=Help{major}{minor}:{keyref}">Français (FR) - Aide de Joomla!</site>
 	</sites>
 </joshelp>

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

@@ -34,7 +34,7 @@ COM_MODULES_FIELD_AUTOMATIC_TITLE_LABEL="Automatic Title"
 COM_MODULES_FIELD_AUTOMATIC_TITLE_DESC="Set yes if you want an automatic translated title. Its use depends on the Administrator template."
 COM_MODULES_FIELD_CACHE_TIME_DESC="The time in seconds before the module is recached."
 COM_MODULES_FIELD_CACHE_TIME_LABEL="Cache Time"
-COM_MODULES_FIELD_CACHING_DESC="Use the global setting for cache for the content of this module or disable caching for this module."
+COM_MODULES_FIELD_CACHING_DESC="Use the global cache setting to cache the content of this module or disable caching for this module."
 COM_MODULES_FIELD_CACHING_LABEL="Caching"
 COM_MODULES_FIELD_CLIENT_ID_DESC="The location of the module, Frontend or Backend. You can't change this value."
 COM_MODULES_FIELD_CLIENT_ID_LABEL="Module Location"
@@ -69,6 +69,7 @@ COM_MODULES_FIELD_MODULE_STYLE_LABEL="Module Style"
 COM_MODULES_FIELD_MODULE_STYLE_DESC="Use this option to override the template style for it's position."
 COM_MODULES_FIELDSET_RULES="Module Permissions"
 COM_MODULES_FILTER_SEARCH_DESC="Filter by position name."
+COM_MODULES_GENERAL_FIELDSET_DESC="Configure module edit interface settings."
 COM_MODULES_HEADING_MODULE="Type"
 COM_MODULES_HEADING_MODULE_ASC="Type ascending"
 COM_MODULES_HEADING_MODULE_DESC="Type descending"

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

@@ -55,7 +55,7 @@ COM_USERS_CONFIG_FIELD_MINIMUM_PASSWORD_LENGTH_DESC="Set the minimum length for
 COM_USERS_CONFIG_FIELD_MINIMUM_SYMBOLS="Minimum Symbols"
 COM_USERS_CONFIG_FIELD_MINIMUM_SYMBOLS_DESC="Set the minimum number of symbols (such as !@#$) required in a password."
 COM_USERS_CONFIG_FIELD_MINIMUM_UPPERCASE="Minimum Upper Case"
-COM_USERS_CONFIG_FIELD_MINIMUM_UPPERCASE_DESC="Set the minimum number of upper case ASCII characters required for a password."
+COM_USERS_CONFIG_FIELD_MINIMUM_UPPERCASE_DESC="Set the minimum number of upper case alphabetical characters required for a password."
 COM_USERS_CONFIG_FIELD_NEW_USER_TYPE_DESC="The default group that will be applied to New Users Registering via the Frontend."
 COM_USERS_CONFIG_FIELD_NEW_USER_TYPE_LABEL="New User Registration Group"
 COM_USERS_CONFIG_FIELD_NOTES_HISTORY="User Notes History"

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

@@ -527,6 +527,8 @@ JLIB_INSTALLER_ABORT_TPL_INSTALL_FAILED_CREATE_DIRECTORY="Template Install: Fail
 JLIB_INSTALLER_ABORT_TPL_INSTALL_ROLLBACK="Template Install: %s"
 JLIB_INSTALLER_ABORT_TPL_INSTALL_UNKNOWN_CLIENT="Template Install: Unknown client type [%s]"
 JLIB_INSTALLER_AVAILABLE_UPDATE_PHP_VERSION="For the extension %1$s version %2$s is available, but it requires at least PHP version %3$s while your system only has %4$s"
+JLIB_INSTALLER_AVAILABLE_UPDATE_DB_MINIMUM="For the extension %1$s version %2$s is available, but your current database %3$s is version %4$s and is not supported. Please contact your web host to update your Database version to at least version %5$s."
+JLIB_INSTALLER_AVAILABLE_UPDATE_DB_TYPE="For the extension %1$s version %2$s is available, but your current database %3$s is not supported anymore."
 JLIB_INSTALLER_PURGED_UPDATES="Cleared updates"
 JLIB_INSTALLER_FAILED_TO_PURGE_UPDATES="Failed to clear updates."
 JLIB_INSTALLER_DEFAULT_STYLE="%s - Default"

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

@@ -37,6 +37,7 @@ TPL_ISIS_STATUS_LABEL="Status Module Position"
 TPL_ISIS_STATUS_TOP="Top"
 TPL_ISIS_STICKY_DESC="Optionally set the toolbar to a fixed (pinned) location."
 TPL_ISIS_STICKY_LABEL="Pinned Toolbar"
+TPL_ISIS_TOGGLE_MENU="Toggle Navigation"
 TPL_ISIS_TOOLBAR="Toolbar"
 TPL_ISIS_USERMENU="User Menu"
 TPL_ISIS_XML_DESCRIPTION="Continuing the Egyptian god/goddess theme (Khepri from 1.5 and Hathor from 1.6), Isis is the Joomla 3 administrator template based on Bootstrap and the launch of the Joomla User Interface library (JUI)."

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

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <metafile version="3.6" client="administrator">
 	<name>English (en-GB)</name>
-	<version>3.6.3</version>
-	<creationDate>September 2016</creationDate>
+	<version>3.6.4</version>
+	<creationDate>October 2016</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.6" client="administrator" type="language" method="upgrade">
 	<name>English (United Kingdom)</name>
 	<tag>en-GB</tag>
-	<version>3.6.3</version>
-	<creationDate>September 2016</creationDate>
+	<version>3.6.4</version>
+	<creationDate>October 2016</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 - 2016 Open Source Matters. All rights reserved</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
-	<version>3.6.3-rc1</version>
-	<creationDate>September 2016</creationDate>
+	<version>3.6.4-dev</version>
+	<creationDate>October 2016</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.6" method="upgrade">
 	<name>English (en-GB) Language Pack</name>
 	<packagename>en-GB</packagename>
-	<version>3.6.3.1</version>
-	<creationDate>September 2016</creationDate>
+	<version>3.6.4.1</version>
+	<creationDate>October 2016</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>

administrator/templates/isis/error.php

@@ -136,6 +136,7 @@
 			<div class="container-fluid">
 				<?php if ($params->get('admin_menus') != '0') : ?>
 					<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
+						<span class="element-invisible"><?php echo JTEXT::_('TPL_ISIS_TOGGLE_MENU'); ?></span>
 						<span class="icon-bar"></span>
 						<span class="icon-bar"></span>
 						<span class="icon-bar"></span>

administrator/templates/isis/index.php

@@ -184,6 +184,7 @@ function colorIsLight($color)
 		<div class="container-fluid">
 			<?php if ($this->params->get('admin_menus') != '0') : ?>
 				<a href="#" class="btn btn-navbar collapsed" data-toggle="collapse" data-target=".nav-collapse">
+					<span class="element-invisible"><?php echo JTEXT::_('TPL_ISIS_TOGGLE_MENU'); ?></span>
 					<span class="icon-bar"></span>
 					<span class="icon-bar"></span>
 					<span class="icon-bar"></span>

administrator/templates/isis/language/en-GB/en-GB.tpl_isis.ini

@@ -37,6 +37,7 @@ TPL_ISIS_STATUS_LABEL="Status Module Position"
 TPL_ISIS_STATUS_TOP="Top"
 TPL_ISIS_STICKY_DESC="Optionally set the toolbar to a fixed (pinned) location."
 TPL_ISIS_STICKY_LABEL="Pinned Toolbar"
+TPL_ISIS_TOGGLE_MENU="Toggle Navigation"
 TPL_ISIS_TOOLBAR="Toolbar"
 TPL_ISIS_USERMENU="User Menu"
 TPL_ISIS_XML_DESCRIPTION="Continuing the Egyptian god/goddess theme (Khepri from 1.5 and Hathor from 1.6), Isis is the Joomla 3 administrator template based on Bootstrap and the launch of the Joomla User Interface library (JUI)."

build/build.php

@@ -99,6 +99,7 @@
  * These paths are from the repository root without the leading slash
  */
 $doNotPackage = array(
+	'.drone.yml',
 	'.github',
 	'.gitignore',
 	'.php_cs',
@@ -108,10 +109,10 @@
 	'build.xml',
 	'composer.json',
 	'composer.lock',
+	'karma.conf.js',
 	'phpunit.xml.dist',
 	'tests',
 	'travisci-phpunit.xml',
-	'karma.conf.js',
 	// Remove the testing sample data from all packages
 	'installation/sql/mysql/sample_testing.sql',
 	'installation/sql/postgresql/sample_testing.sql',

components/com_contact/controllers/contact.php

@@ -59,7 +59,7 @@ public function submit()
 		// Check for a valid session cookie
 		if ($params->get('validate_session', 0))
 		{
-			if (JFactory::getSession()->getState() != 'active')
+			if (JFactory::getSession()->getState() !== 'active')
 			{
 				JError::raiseWarning(403, JText::_('JLIB_ENVIRONMENT_SESSION_INVALID'));