Merge remote-tracking branch 'upstream/staging' into staging

.gitignore

@@ -9,6 +9,7 @@
 /administrator/cache
 /administrator/logs
 /cache
+/installation/cache
 /tmp
 /configuration.php
 /.htaccess

README.md

@@ -49,7 +49,7 @@ Is it easy to change the layout display?
 
 Ready to install Joomla?
 ---------------------
-* Check the [minimum requirements](https://www.joomla.org/technical-requirements.html). 
+* Check the [minimum requirements](https://www.joomla.org/about-joomla/technical-requirements.html). 
 * How do you [install Joomla](https://docs.joomla.org/Installing_Joomla!)?
 * You could start your Joomla! experience by [building your site on a local test server](https://docs.joomla.org/Installing_Joomla_locally).
 When ready, it can be moved to an on-line hosting account of your choice.

README.txt

@@ -33,7 +33,7 @@
 	* There are lots of ready made templates that you can download.
 
 8- Ready to install Joomla?
-	* See minimum requirements here: https://www.joomla.org/technical-requirements.html
+	* See minimum requirements here: https://www.joomla.org/about-joomla/technical-requirements.html
 	* How do you install Joomla! ? - https://docs.joomla.org/Installing_Joomla!
 	* Start your Joomla experience building your site with a local test server.
 	When ready it can be moved to an on-line hosting account of your choice.

administrator/components/com_admin/models/sysinfo.php

@@ -102,7 +102,7 @@ class AdminModelSysInfo extends JModelLegacy
 			'session.save_path',
 			'upload_tmp_dir',
 			'User/Group',
-			'open_basedir'
+			'open_basedir',
 		),
 		'other' => array(
 			'db',
@@ -126,7 +126,7 @@ class AdminModelSysInfo extends JModelLegacy
 			'sitename',
 			'smtphost',
 			'tmp_path',
-			'open_basedir'
+			'open_basedir',
 		)
 	);
 
@@ -274,7 +274,7 @@ public function &getConfig()
 
 		$registry = new Registry(new JConfig);
 		$this->config = $registry->toArray();
-		$hidden = array('host', 'user', 'password', 'ftp_user', 'ftp_pass', 'smtpuser', 'smtppass');
+		$hidden = array('host', 'user', 'password', 'ftp_user', 'ftp_pass', 'smtpuser', 'smtppass',);
 
 		foreach ($hidden as $key)
 		{
@@ -312,7 +312,7 @@ public function &getInfo()
 			'sapi_name'             => php_sapi_name(),
 			'version'               => $version->getLongVersion(),
 			'platform'              => $platform->getLongVersion(),
-			'useragent'             => isset($_SERVER['HTTP_USER_AGENT']) ? $_SERVER['HTTP_USER_AGENT'] : ""
+			'useragent'             => isset($_SERVER['HTTP_USER_AGENT']) ? $_SERVER['HTTP_USER_AGENT'] : "",
 		);
 
 		return $this->info;
@@ -525,7 +525,10 @@ public function getDirectory($public = false)
 				continue;
 			}
 
-			$this->addDirectory('administrator/language/' . $folder->getFilename(), JPATH_ADMINISTRATOR . '/language/' . $folder->getFilename());
+			$this->addDirectory(
+				'administrator/language/' . $folder->getFilename(),
+				JPATH_ADMINISTRATOR . '/language/' . $folder->getFilename()
+			);
 		}
 
 		// List all manifests folders
@@ -538,7 +541,10 @@ public function getDirectory($public = false)
 				continue;
 			}
 
-			$this->addDirectory('administrator/manifests/' . $folder->getFilename(), JPATH_ADMINISTRATOR . '/manifests/' . $folder->getFilename());
+			$this->addDirectory(
+				'administrator/manifests/' . $folder->getFilename(),
+				JPATH_ADMINISTRATOR . '/manifests/' . $folder->getFilename()
+			);
 		}
 
 		$this->addDirectory('administrator/modules', JPATH_ADMINISTRATOR . '/modules');
@@ -558,7 +564,10 @@ public function getDirectory($public = false)
 				continue;
 			}
 
-			$this->addDirectory('images/' . $folder->getFilename(), JPATH_SITE . '/' . $cparams->get('image_path') . '/' . $folder->getFilename());
+			$this->addDirectory(
+				'images/' . $folder->getFilename(),
+				JPATH_SITE . '/' . $cparams->get('image_path') . '/' . $folder->getFilename()
+			);
 		}
 
 		$this->addDirectory('language', JPATH_SITE . '/language');
@@ -611,8 +620,16 @@ public function getDirectory($public = false)
 
 		if ($public)
 		{
-			$this->addDirectory('log', $registry->get('log_path', JPATH_ADMINISTRATOR . '/logs'), 'COM_ADMIN_LOG_DIRECTORY');
-			$this->addDirectory('tmp', $registry->get('tmp_path', JPATH_ROOT . '/tmp'), 'COM_ADMIN_TEMP_DIRECTORY');
+			$this->addDirectory(
+				'log',
+				$registry->get('log_path', JPATH_ADMINISTRATOR . '/logs'),
+				'COM_ADMIN_LOG_DIRECTORY'
+			);
+			$this->addDirectory(
+				'tmp',
+				$registry->get('tmp_path', JPATH_ROOT . '/tmp'),
+				'COM_ADMIN_TEMP_DIRECTORY'
+			);
 		}
 		else
 		{
@@ -621,7 +638,11 @@ public function getDirectory($public = false)
 				$registry->get('log_path', JPATH_ADMINISTRATOR . '/logs'),
 				'COM_ADMIN_LOG_DIRECTORY'
 			);
-			$this->addDirectory($registry->get('tmp_path', JPATH_ROOT . '/tmp'), $registry->get('tmp_path', JPATH_ROOT . '/tmp'), 'COM_ADMIN_TEMP_DIRECTORY');
+			$this->addDirectory(
+				$registry->get('tmp_path', JPATH_ROOT . '/tmp'),
+				$registry->get('tmp_path', JPATH_ROOT . '/tmp'),
+				'COM_ADMIN_TEMP_DIRECTORY'
+			);
 		}
 
 		return $this->directories;
@@ -640,7 +661,7 @@ public function getDirectory($public = false)
 	 */
 	private function addDirectory($name, $path, $message = '')
 	{
-		$this->directories[$name] = array('writable' => is_writable($path), 'message' => $message);
+		$this->directories[$name] = array('writable' => is_writable($path), 'message' => $message,);
 	}
 
 	/**
@@ -697,7 +718,7 @@ protected function parsePhpInfo($html)
 					// 3cols
 					if (preg_match($p2, $val, $matchs))
 					{
-						$r[$name][trim($matchs[1])] = array(trim($matchs[2]), trim($matchs[3]));
+						$r[$name][trim($matchs[1])] = array(trim($matchs[2]), trim($matchs[3]),);
 					}
 					// 2cols
 					elseif (preg_match($p3, $val, $matchs))

administrator/components/com_admin/script.php

@@ -1421,6 +1421,8 @@ public function deleteUnexistingFiles()
 			'/libraries/simplepie/idn/idna_convert.class.php',
 			'/libraries/simplepie/idn/npdata.ser',
 			'/administrator/manifests/libraries/simplepie.xml',
+			'/administrator/templates/isis/js/jquery.js',
+			'/administrator/templates/isis/js/bootstrap.min.js',
 		);
 
 		// TODO There is an issue while deleting folders using the ftp mode

administrator/components/com_admin/sql/updates/mysql/3.6.0-2016-04-01.sql

@@ -1,3 +1,7 @@
+-- Rename update site names
+UPDATE `#__update_sites` SET `name` = 'Joomla! Core' WHERE `name` = 'Joomla Core' AND `type` = 'collection';
+UPDATE `#__update_sites` SET `name` = 'Joomla! Extension Directory' WHERE `name` = 'Joomla Extension Directory' AND `type` = 'collection';
+
 UPDATE `#__update_sites` SET `location` = 'https://update.joomla.org/core/list.xml' WHERE `name` = 'Joomla! Core' AND `type` = 'collection';
 UPDATE `#__update_sites` SET `location` = 'https://update.joomla.org/jed/list.xml' WHERE `name` = 'Joomla! Extension Directory' AND `type` = 'collection';
 UPDATE `#__update_sites` SET `location` = 'https://update.joomla.org/language/translationlist_3.xml' WHERE `name` = 'Accredited Joomla! Translations' AND `type` = 'collection';

administrator/components/com_admin/sql/updates/mysql/3.6.0-2016-06-01.sql

@@ -0,0 +1 @@
+UPDATE `#__extensions` SET `protected` = 1, `enabled` = 1  WHERE `name` = 'com_ajax';

administrator/components/com_admin/sql/updates/mysql/3.6.0-2016-06-05.sql

@@ -0,0 +1,5 @@
+--
+-- Add ACL check for to #__languages
+--
+
+ALTER TABLE `#__languages` ADD COLUMN `asset_id` INT(11) NOT NULL AFTER `lang_id`;

administrator/components/com_admin/sql/updates/postgresql/3.6.0-2016-04-01.sql

@@ -1,3 +1,7 @@
+-- Rename update site names
+UPDATE "#__update_sites" SET "name" = 'Joomla! Core' WHERE "name" = 'Joomla Core' AND "type" = 'collection';
+UPDATE "#__update_sites" SET "name" = 'Joomla! Extension Directory' WHERE "name" = 'Joomla Extension Directory' AND "type" = 'collection';
+
 UPDATE "#__update_sites" SET "location" = 'https://update.joomla.org/core/list.xml' WHERE "name" = 'Joomla! Core' AND "type" = 'collection';
 UPDATE "#__update_sites" SET "location" = 'https://update.joomla.org/jed/list.xml' WHERE "name" = 'Joomla! Extension Directory' AND "type" = 'collection';
 UPDATE "#__update_sites" SET "location" = 'https://update.joomla.org/language/translationlist_3.xml' WHERE "name" = 'Accredited Joomla! Translations' AND "type" = 'collection';

administrator/components/com_admin/sql/updates/postgresql/3.6.0-2016-06-01.sql

@@ -0,0 +1 @@
+UPDATE "#__extensions" SET "protected" = 1, "enabled" = 1 WHERE "name" = "com_ajax";

administrator/components/com_admin/sql/updates/postgresql/3.6.0-2016-06-05.sql

@@ -0,0 +1,5 @@
+--
+-- Add ACL check for to #__languages
+--
+
+ALTER TABLE "#__languages" ADD COLUMN "asset_id" bigint DEFAULT 0 NOT NULL;

administrator/components/com_admin/sql/updates/sqlazure/3.6.0-2016-04-01.sql

@@ -1,3 +1,7 @@
+-- Rename update site names
+UPDATE [#__update_sites] SET [name] = 'Joomla! Core' WHERE [name] = 'Joomla Core' AND [type] = 'collection';
+UPDATE [#__update_sites] SET [name] = 'Joomla! Extension Directory' WHERE [name] = 'Joomla Extension Directory' AND [type] = 'collection';
+
 UPDATE [#__update_sites] SET [location] = 'https://update.joomla.org/core/list.xml' WHERE [name] = 'Joomla! Core' AND [type] = 'collection';
 UPDATE [#__update_sites] SET [location] = 'https://update.joomla.org/jed/list.xml' WHERE [name] = 'Joomla! Extension Directory' AND [type] = 'collection';
 UPDATE [#__update_sites] SET [location] = 'https://update.joomla.org/language/translationlist_3.xml' WHERE [name] = 'Accredited Joomla! Translations' AND [type] = 'collection';

administrator/components/com_admin/sql/updates/sqlazure/3.6.0-2016-06-01.sql

@@ -0,0 +1 @@
+UPDATE [#__extensions] SET [protected] = 1, [enabled] = 1 WHERE [name] = 'com_ajax';

administrator/components/com_admin/sql/updates/sqlazure/3.6.0-2016-06-05.sql

@@ -0,0 +1,5 @@
+--
+-- Add ACL check for to #__languages
+--
+
+ALTER TABLE [#__languages] ADD [asset_id] [bigint] NOT NULL DEFAULT 0;

administrator/components/com_admin/views/sysinfo/tmpl/default_system.php

@@ -105,7 +105,7 @@
 					<strong><?php echo JText::_('COM_ADMIN_USER_AGENT'); ?></strong>
 				</td>
 				<td>
-					<?php echo htmlspecialchars($this->info['useragent']); ?>
+					<?php echo htmlspecialchars($this->info['useragent'], ENT_COMPAT, 'UTF-8'); ?>
 				</td>
 			</tr>
 		</tbody>

administrator/components/com_banners/access.xml

@@ -1,18 +1,72 @@
 <?xml version="1.0" encoding="utf-8"?>
 <access component="com_banners">
 	<section name="component">
-		<action name="core.admin" title="JACTION_ADMIN" description="JACTION_ADMIN_COMPONENT_DESC" />
-		<action name="core.options" title="JACTION_OPTIONS" description="JACTION_OPTIONS_COMPONENT_DESC" />
-		<action name="core.manage" title="JACTION_MANAGE" description="JACTION_MANAGE_COMPONENT_DESC" />
-		<action name="core.create" title="JACTION_CREATE" description="JACTION_CREATE_COMPONENT_DESC" />
-		<action name="core.delete" title="JACTION_DELETE" description="JACTION_DELETE_COMPONENT_DESC" />
-		<action name="core.edit" title="JACTION_EDIT" description="JACTION_EDIT_COMPONENT_DESC" />
-		<action name="core.edit.state" title="JACTION_EDITSTATE" description="JACTION_EDITSTATE_COMPONENT_DESC" />
+		<action
+			name="core.admin"
+			description="JACTION_ADMIN_COMPONENT_DESC"
+			title="JACTION_ADMIN"
+		/>
+
+		<action
+			name="core.options"
+			description="JACTION_OPTIONS_COMPONENT_DESC"
+			title="JACTION_OPTIONS"
+		/>
+
+		<action
+			name="core.manage"
+			description="JACTION_MANAGE_COMPONENT_DESC"
+			title="JACTION_MANAGE"
+		/>
+
+		<action
+			name="core.create"
+			description="JACTION_CREATE_COMPONENT_DESC"
+			title="JACTION_CREATE"
+		/>
+
+		<action
+			name="core.delete"
+			description="JACTION_DELETE_COMPONENT_DESC"
+			title="JACTION_DELETE"
+		/>
+
+		<action
+			name="core.edit"
+			description="JACTION_EDIT_COMPONENT_DESC"
+			title="JACTION_EDIT"
+		/>
+
+		<action
+			name="core.edit.state"
+			description="JACTION_EDITSTATE_COMPONENT_DESC"
+			title="JACTION_EDITSTATE"
+		/>
+
 	</section>
 	<section name="category">
-		<action name="core.create" title="JACTION_CREATE" description="COM_CATEGORIES_ACCESS_CREATE_DESC" />
-		<action name="core.delete" title="JACTION_DELETE" description="COM_CATEGORIES_ACCESS_DELETE_DESC" />
-		<action name="core.edit" title="JACTION_EDIT" description="COM_CATEGORIES_ACCESS_EDIT_DESC" />
-		<action name="core.edit.state" title="JACTION_EDITSTATE" description="COM_CATEGORIES_ACCESS_EDITSTATE_DESC" />
+		<action
+			name="core.create"
+			description="COM_CATEGORIES_ACCESS_CREATE_DESC"
+			title="JACTION_CREATE"
+		/>
+
+		<action
+			name="core.delete"
+			description="COM_CATEGORIES_ACCESS_DELETE_DESC"
+			title="JACTION_DELETE"
+		/>
+
+		<action
+			name="core.edit"
+			description="COM_CATEGORIES_ACCESS_EDIT_DESC"
+			title="JACTION_EDIT"
+		/>
+
+		<action
+			name="core.edit.state"
+			description="COM_CATEGORIES_ACCESS_EDITSTATE_DESC"
+			title="JACTION_EDITSTATE"
+		/>
 	</section>
 </access>

administrator/components/com_banners/banners.xml

@@ -35,14 +35,38 @@
 				Note that all & must be escaped to & for the file to be valid
 				XML and be parsed by the installer
 			-->
-			<menu link="option=com_banners" view="banners" img="class:banners"
-				alt="Banners/Banners">com_banners_banners</menu>
-			<menu link="option=com_categories&amp;extension=com_banners"
-				view="categories" img="class:banners-cat" alt="Banners/Categories">com_banners_categories</menu>
-			<menu link="option=com_banners&amp;view=clients" view="clients"
-				img="class:banners-clients" alt="Banners/Clients">com_banners_clients</menu>
-			<menu link="option=com_banners&amp;view=tracks" view="tracks"
-				img="class:banners-tracks" alt="Banners/Tracks">com_banners_tracks</menu>
+			<menu
+				link="option=com_banners"
+				view="banners"
+				img="class:banners"
+				alt="Banners/Banners"
+				>
+				com_banners_banners
+			</menu>
+			<menu
+				link="option=com_categories&amp;extension=com_banners"
+				view="categories"
+				img="class:banners-cat"
+				alt="Banners/Categories"
+				>
+				com_banners_categories
+			</menu>
+			<menu
+				link="option=com_banners&amp;view=clients"
+				view="clients"
+				img="class:banners-clients"
+				alt="Banners/Clients"
+				>
+				com_banners_clients
+			</menu>
+			<menu
+				link="option=com_banners&amp;view=tracks"
+				view="tracks"
+				img="class:banners-tracks"
+				alt="Banners/Tracks"
+				>
+				com_banners_tracks
+			</menu>
 		</submenu>
 		<files folder="admin">
 			<filename>access.xml</filename>