From d0fc1e8091b45ff13f56f99b93dfce7fd69caaae Mon Sep 17 00:00:00 2001
From: Maximilian Ruta <mr@deltachaos.de>
Date: Sat, 20 Aug 2016 13:37:47 +0200
Subject: [PATCH 01/13] Fix wrong PHP doc type (#11683)

---
 libraries/cms/helper/tags.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/cms/helper/tags.php b/libraries/cms/helper/tags.php
index f67b44caaa812..f12a795ab125a 100644
--- a/libraries/cms/helper/tags.php
+++ b/libraries/cms/helper/tags.php
@@ -383,7 +383,7 @@ public function deleteTagData(JTableInterface $table, $contentItemId)
 	/**
 	 * Method to get a list of tags for an item, optionally with the tag data.
 	 *
-	 * @param   integer  $contentType  Content type alias. Dot separated.
+	 * @param   string   $contentType  Content type alias. Dot separated.
 	 * @param   integer  $id           Id of the item to retrieve tags for.
 	 * @param   boolean  $getTagData   If true, data from the tags table will be included, defaults to true.
 	 *

From a0b3e3ea5074dde2dab8252b3be394678905843b Mon Sep 17 00:00:00 2001
From: andrepereiradasilva <andrepereiradasilva@users.noreply.github.com>
Date: Sat, 20 Aug 2016 12:38:06 +0100
Subject: [PATCH 02/13] use JAuthenticationHelper (#11684)

---
 plugins/authentication/joomla/joomla.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/plugins/authentication/joomla/joomla.php b/plugins/authentication/joomla/joomla.php
index e0b219b18191f..8e234fae67b58 100644
--- a/plugins/authentication/joomla/joomla.php
+++ b/plugins/authentication/joomla/joomla.php
@@ -90,9 +90,7 @@ public function onUserAuthenticate($credentials, $options, &$response)
 		// Check the two factor authentication
 		if ($response->status == JAuthentication::STATUS_SUCCESS)
 		{
-			JLoader::register('UsersHelper', JPATH_ADMINISTRATOR . '/components/com_users/helpers/users.php');
-
-			$methods = UsersHelper::getTwoFactorMethods();
+			$methods = JAuthenticationHelper::getTwoFactorMethods();
 
 			if (count($methods) <= 1)
 			{

From 50490b9f79247ee19bbbd64527d243c734cbc7be Mon Sep 17 00:00:00 2001
From: zero-24 <zero-24@users.noreply.github.com>
Date: Sat, 20 Aug 2016 13:38:39 +0200
Subject: [PATCH 03/13] fix testing sampledata viewlevels (#11674)

---
 installation/sql/mysql/sample_testing.sql      | 14 +++++++++++++-
 installation/sql/postgresql/sample_testing.sql | 14 ++++++++++++++
 installation/sql/sqlazure/sample_testing.sql   |  7 ++++---
 3 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/installation/sql/mysql/sample_testing.sql b/installation/sql/mysql/sample_testing.sql
index 2d13a7a1e30e9..818fa6e6b19ba 100644
--- a/installation/sql/mysql/sample_testing.sql
+++ b/installation/sql/mysql/sample_testing.sql
@@ -11,9 +11,13 @@ TRUNCATE `#__menu`;
 TRUNCATE `#__menu_types`;
 TRUNCATE `#__modules`;
 TRUNCATE `#__modules_menu`;
-TRUNCATE `#__usergroups`;
 TRUNCATE `#__tags`;
+TRUNCATE `#__usergroups`;
+TRUNCATE `#__viewlevels`;
 
+--
+-- Dumping data for table #__assets
+--
 INSERT IGNORE INTO `#__assets` (`id`, `parent_id`, `lft`, `rgt`, `level`, `name`, `title`, `rules`) VALUES
 (1, 0, 1, 437, 0, 'root.1', 'Root Asset', '{"core.login.site":{"6":1,"2":1},"core.login.admin":{"6":1},"core.admin":{"8":1},"core.manage":{"7":1},"core.create":{"6":1,"3":1},"core.delete":{"6":1},"core.edit":{"6":1,"4":1},"core.edit.state":{"6":1,"5":1},"core.edit.own":{"6":1,"3":1}}'),
 (2, 1, 2, 3, 1, 'com_admin', 'com_admin', '{}'),
@@ -774,6 +778,14 @@ INSERT IGNORE INTO `#__usergroups` (`id`, `parent_id`, `lft`, `rgt`, `title`) VA
 (12, 2, 17, 18, 'Customer Group (Example)'),
 (13, 1, 2, 3, 'Guest');
 
+INSERT IGNORE INTO `#__viewlevels` (`id`, `title`, `ordering`, `rules`) VALUES
+(1, 'Public', 0, '[1]'),
+(2, 'Registered', 2, '[6,2,8]'),
+(3, 'Special', 4, '[6,3,8]'),
+(4, 'Customer Access Level (Example)', 3, '[6,3,12]'),
+(5, 'Guest', 1, '[13]'),
+(6, 'Super Users', 5, '[8]');
+
 INSERT IGNORE INTO `#__tags` (`id`, `parent_id`, `lft`, `rgt`, `level`, `path`, `title`, `alias`, `note`, `description`, `published`, `checked_out`, `checked_out_time`, `access`, `params`, `metadesc`, `metakey`, `metadata`, `created_user_id`, `created_time`, `created_by_alias`, `modified_user_id`, `modified_time`, `images`, `urls`, `hits`, `language`, `version`, `publish_up`, `publish_down`) VALUES
 (1, 0, 0, 9, 0, '', 'ROOT', 'root', '', '', 1, 0, '0000-00-00 00:00:00', 1, '{}', '', '', '', 0, '2011-01-01 00:00:01', '', 0, '0000-00-00 00:00:00', '', '', 0, '*', 1, '0000-00-00 00:00:00', '0000-00-00 00:00:00'),
 (2, 1, 1, 2, 1, 'red', 'Red', 'red', '', '', 1, 0, '0000-00-00 00:00:00', 1, '{"tag_layout":"","tag_link_class":"label label-info","image_intro":"","float_intro":"","image_intro_alt":"","image_intro_caption":"","image_fulltext":"","float_fulltext":"","image_fulltext_alt":"","image_fulltext_caption":""}', '', '', '{"author":"","robots":""}', 716, '2013-10-15 14:52:40', '', 0, '0000-00-00 00:00:00', '', '', 2, '*', 1, '0000-00-00 00:00:00', '0000-00-00 00:00:00'),
diff --git a/installation/sql/postgresql/sample_testing.sql b/installation/sql/postgresql/sample_testing.sql
index 4931e7d1342ca..3472e6530aa64 100644
--- a/installation/sql/postgresql/sample_testing.sql
+++ b/installation/sql/postgresql/sample_testing.sql
@@ -6,6 +6,7 @@ TRUNCATE "#__modules" RESTART IDENTITY;
 TRUNCATE "#__modules_menu" RESTART IDENTITY;
 TRUNCATE "#__tags" RESTART IDENTITY;
 TRUNCATE "#__usergroups" RESTART IDENTITY;
+TRUNCATE "#__viewlevels" RESTART IDENTITY;
 
 --
 -- Dumping data for table #__assets
@@ -845,3 +846,16 @@ INSERT INTO "#__usergroups" VALUES
 (13,1,2,3,'Guest');
 
 SELECT setval('#__usergroups_id_seq', max(id)) FROM #__usergroups;
+
+--
+-- Dumping data for table #__viewlevels
+--
+INSERT INTO "#__viewlevels" VALUES
+(1,'Public',0,'[1]'),
+(2,'Registered',2,'[6,2,8]'),
+(3,'Special',4,'[6,3,8]'),
+(4,'Customer Access Level (Example)',3,'[6,3,12]'),
+(5,'Guest',1,'[13]'),
+(6,'Super Users',5,'[8]');
+
+SELECT setval('#__viewlevels_id_seq', max(id)) FROM #__viewlevels;
\ No newline at end of file
diff --git a/installation/sql/sqlazure/sample_testing.sql b/installation/sql/sqlazure/sample_testing.sql
index 7df63b425caef..90f1bdd97c9f1 100644
--- a/installation/sql/sqlazure/sample_testing.sql
+++ b/installation/sql/sqlazure/sample_testing.sql
@@ -1198,8 +1198,9 @@ SET IDENTITY_INSERT [#__viewlevels] ON;
 
 INSERT [#__viewlevels] ([id], [title], [ordering], [rules]) VALUES (1, 'Public', 0, '[1]');
 INSERT [#__viewlevels] ([id], [title], [ordering], [rules]) VALUES (2, 'Registered', 2, '[6,2,8]');
-INSERT [#__viewlevels] ([id], [title], [ordering], [rules]) VALUES (3, 'Special', 3, '[6,3,8]');
-INSERT [#__viewlevels] ([id], [title], [ordering], [rules]) VALUES (5, 'Guest', 1, '[9]');
-INSERT [#__viewlevels] ([id], [title], [ordering], [rules]) VALUES (6, 'Super Users', 4, '[8]');
+INSERT [#__viewlevels] ([id], [title], [ordering], [rules]) VALUES (3, 'Special', 4, '[6,3,8]');
+INSERT [#__viewlevels] ([id], [title], [ordering], [rules]) VALUES (4, 'Customer Access Level (Example)', 3, '[6,3,12]');
+INSERT [#__viewlevels] ([id], [title], [ordering], [rules]) VALUES (5, 'Guest', 1, '[13]');
+INSERT [#__viewlevels] ([id], [title], [ordering], [rules]) VALUES (6, 'Super Users', 5, '[8]');
 
 SET IDENTITY_INSERT [#__viewlevels] OFF;

From 65ea0b5a8275623f5022d6a77c7696ad8ebe5ff1 Mon Sep 17 00:00:00 2001
From: Brian Teeman <brian@teeman.net>
Date: Sat, 20 Aug 2016 12:47:54 +0100
Subject: [PATCH 04/13] Use intro_image in newsfeed (#11402)

* Use intro_image in newsfeed

* code style

* add featured feed

* code style

* typo

* new lines
---
 components/com_content/views/category/view.feed.php | 13 +++++++++++--
 components/com_content/views/featured/view.feed.php | 11 ++++++++++-
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/components/com_content/views/category/view.feed.php b/components/com_content/views/category/view.feed.php
index 0223547bd7f89..c67a90cc96d52 100644
--- a/components/com_content/views/category/view.feed.php
+++ b/components/com_content/views/category/view.feed.php
@@ -34,10 +34,19 @@ class ContentViewCategory extends JViewCategoryfeed
 	 */
 	protected function reconcileNames($item)
 	{
-		// Get description, author and date
+		// Get description, intro_image, author and date
 		$app               = JFactory::getApplication();
 		$params            = $app->getParams();
-		$item->description = $params->get('feed_summary', 0) ? $item->introtext . $item->fulltext : $item->introtext;
+		$item->description = '';
+		$obj = json_decode($item->images);
+		$introImage = ( isset( $obj->{'image_intro'} ) ) ? $obj->{'image_intro'} : '';
+
+		if (isset($introImage) && ($introImage != "")) 
+		{
+			$image = preg_match('/http/', $introImage)? $introImage : JURI::root() . $introImage;
+			$item->description = '<p><img src="' . $image . '" /></p>';
+		}
+		$item->description .= ($params->get('feed_summary', 0) ? $item->introtext . $item->fulltext : $item->introtext);         
 
 		// Add readmore link to description if introtext is shown, show_readmore is true and fulltext exists
 		if (!$item->params->get('feed_summary', 0) && $item->params->get('feed_show_readmore', 0) && $item->fulltext)
diff --git a/components/com_content/views/featured/view.feed.php b/components/com_content/views/featured/view.feed.php
index e01bb49335e65..b571ec10e8c49 100644
--- a/components/com_content/views/featured/view.feed.php
+++ b/components/com_content/views/featured/view.feed.php
@@ -59,7 +59,16 @@ public function display($tpl = null)
 			$db->setQuery($query);
 			$row->fulltext = $db->loadResult();
 
-			$description = ($params->get('feed_summary', 0) ? $row->introtext . $row->fulltext : $row->introtext);
+			$description = '';
+			$obj = json_decode($row->images);
+			$introImage = ( isset( $obj->{'image_intro'} ) ) ? $obj->{'image_intro'} : '';
+
+			if (isset($introImage) && ($introImage != "")) 
+			{
+				$image = preg_match('/http/', $introImage)? $introImage : JURI::root() . $introImage;
+				$description = '<p><img src="' . $image . '" /></p>';
+			}
+			$description .= ($params->get('feed_summary', 0) ? $row->introtext . $row->fulltext : $row->introtext);  			
 			$author      = $row->created_by_alias ? $row->created_by_alias : $row->author;
 
 			// Load individual item creator class

From 41b3959688151e3661325f184063d65445f7f2db Mon Sep 17 00:00:00 2001
From: andrepereiradasilva <andrepereiradasilva@users.noreply.github.com>
Date: Sat, 20 Aug 2016 13:13:14 +0100
Subject: [PATCH 05/13] [admin mod_login] only load chosen if needed (#11680)

* only load chosen if needed

* use specific class

* missing dot ...

* disable search ...
---
 administrator/modules/mod_login/tmpl/default.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/administrator/modules/mod_login/tmpl/default.php b/administrator/modules/mod_login/tmpl/default.php
index cf0b435eb2f28..7384869c9d5a4 100644
--- a/administrator/modules/mod_login/tmpl/default.php
+++ b/administrator/modules/mod_login/tmpl/default.php
@@ -11,8 +11,12 @@
 
 JHtml::_('behavior.keepalive');
 JHtml::_('bootstrap.tooltip');
-JHtml::_('formbehavior.chosen');
 
+// Load chosen if we have language selector, ie, more than one administrator language installed and enabled.
+if ($langs)
+{
+	JHtml::_('formbehavior.chosen', '.advancedSelect');
+}
 ?>
 <form action="<?php echo JRoute::_('index.php', true, $params->get('usesecure')); ?>" method="post" id="form-login" class="form-inline">
 	<fieldset class="loginform">

From 2ec429f0600ee4c64c63c3972fcfcc3d05acaac2 Mon Sep 17 00:00:00 2001
From: Michael Babker <mbabker@flbab.com>
Date: Sat, 20 Aug 2016 07:13:44 -0500
Subject: [PATCH 06/13] Load template language files if able (#11676)

---
 libraries/joomla/document/error.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/libraries/joomla/document/error.php b/libraries/joomla/document/error.php
index 65e4cb060a121..33d91939f7e1e 100644
--- a/libraries/joomla/document/error.php
+++ b/libraries/joomla/document/error.php
@@ -149,6 +149,16 @@ public function render($cache = false, $params = array())
 		$this->debug = isset($params['debug']) ? $params['debug'] : false;
 		$this->error = $this->_error;
 
+		// Load the language file for the template if able
+		if (JFactory::$language)
+		{
+			$lang = JFactory::getLanguage();
+	
+			// 1.5 or core then 1.6
+			$lang->load('tpl_' . $template, JPATH_BASE, null, false, true)
+				|| $lang->load('tpl_' . $template, $directory . '/' . $template, null, false, true);
+		}
+
 		// Load
 		$data = $this->_loadTemplate($directory . '/' . $template, $file);
 

From 809db9aa9bc6774a0e1afbfeb8840b7cba83a2a3 Mon Sep 17 00:00:00 2001
From: Robert Deutz <rdeutz@googlemail.com>
Date: Sat, 20 Aug 2016 14:43:27 +0200
Subject: [PATCH 07/13] Revert "Use intro_image in newsfeed" (#11685)

---
 components/com_content/views/category/view.feed.php | 13 ++-----------
 components/com_content/views/featured/view.feed.php | 11 +----------
 2 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/components/com_content/views/category/view.feed.php b/components/com_content/views/category/view.feed.php
index c67a90cc96d52..0223547bd7f89 100644
--- a/components/com_content/views/category/view.feed.php
+++ b/components/com_content/views/category/view.feed.php
@@ -34,19 +34,10 @@ class ContentViewCategory extends JViewCategoryfeed
 	 */
 	protected function reconcileNames($item)
 	{
-		// Get description, intro_image, author and date
+		// Get description, author and date
 		$app               = JFactory::getApplication();
 		$params            = $app->getParams();
-		$item->description = '';
-		$obj = json_decode($item->images);
-		$introImage = ( isset( $obj->{'image_intro'} ) ) ? $obj->{'image_intro'} : '';
-
-		if (isset($introImage) && ($introImage != "")) 
-		{
-			$image = preg_match('/http/', $introImage)? $introImage : JURI::root() . $introImage;
-			$item->description = '<p><img src="' . $image . '" /></p>';
-		}
-		$item->description .= ($params->get('feed_summary', 0) ? $item->introtext . $item->fulltext : $item->introtext);         
+		$item->description = $params->get('feed_summary', 0) ? $item->introtext . $item->fulltext : $item->introtext;
 
 		// Add readmore link to description if introtext is shown, show_readmore is true and fulltext exists
 		if (!$item->params->get('feed_summary', 0) && $item->params->get('feed_show_readmore', 0) && $item->fulltext)
diff --git a/components/com_content/views/featured/view.feed.php b/components/com_content/views/featured/view.feed.php
index b571ec10e8c49..e01bb49335e65 100644
--- a/components/com_content/views/featured/view.feed.php
+++ b/components/com_content/views/featured/view.feed.php
@@ -59,16 +59,7 @@ public function display($tpl = null)
 			$db->setQuery($query);
 			$row->fulltext = $db->loadResult();
 
-			$description = '';
-			$obj = json_decode($row->images);
-			$introImage = ( isset( $obj->{'image_intro'} ) ) ? $obj->{'image_intro'} : '';
-
-			if (isset($introImage) && ($introImage != "")) 
-			{
-				$image = preg_match('/http/', $introImage)? $introImage : JURI::root() . $introImage;
-				$description = '<p><img src="' . $image . '" /></p>';
-			}
-			$description .= ($params->get('feed_summary', 0) ? $row->introtext . $row->fulltext : $row->introtext);  			
+			$description = ($params->get('feed_summary', 0) ? $row->introtext . $row->fulltext : $row->introtext);
 			$author      = $row->created_by_alias ? $row->created_by_alias : $row->author;
 
 			// Load individual item creator class

From 36c37ea0135090751946529328906988cd1f19aa Mon Sep 17 00:00:00 2001
From: zero-24 <zero-24@users.noreply.github.com>
Date: Sat, 20 Aug 2016 16:05:54 +0200
Subject: [PATCH 08/13] Postinstall for the case that the Update Cache time is
 eq 0 (#11631)

* postinstall for the updatenotification plugin

* postinstall for the updatenotification plugin

* great autoloader :smile:

* denglisch  => en-GB

* en-GB fix

* en-GB again thanks @brianteeman

* install sql

* install sql missing spaces

* c&p error thanks @sovainfo
---
 .../sql/updates/mysql/3.6.3-2016-08-16.sql    |  2 +
 .../updates/postgresql/3.6.3-2016-08-16.sql   |  2 +
 .../sql/updates/sqlazure/3.6.3-2016-08-16.sql |  2 +
 .../en-GB.plg_system_updatenotification.ini   |  9 ++-
 installation/sql/mysql/joomla.sql             |  3 +-
 installation/sql/postgresql/joomla.sql        |  3 +-
 installation/sql/sqlazure/joomla.sql          |  4 +-
 .../postinstall/updatecachetime.php           | 55 +++++++++++++++++++
 .../updatenotification/updatenotification.php |  8 +++
 9 files changed, 82 insertions(+), 6 deletions(-)
 create mode 100644 administrator/components/com_admin/sql/updates/mysql/3.6.3-2016-08-16.sql
 create mode 100644 administrator/components/com_admin/sql/updates/postgresql/3.6.3-2016-08-16.sql
 create mode 100644 administrator/components/com_admin/sql/updates/sqlazure/3.6.3-2016-08-16.sql
 create mode 100644 plugins/system/updatenotification/postinstall/updatecachetime.php

diff --git a/administrator/components/com_admin/sql/updates/mysql/3.6.3-2016-08-16.sql b/administrator/components/com_admin/sql/updates/mysql/3.6.3-2016-08-16.sql
new file mode 100644
index 0000000000000..06d2c9e9565ce
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/mysql/3.6.3-2016-08-16.sql
@@ -0,0 +1,2 @@
+INSERT INTO `#__postinstall_messages` (`extension_id`, `title_key`, `description_key`, `action_key`, `language_extension`, `language_client_id`, `type`, `action_file`, `action`, `condition_file`, `condition_method`, `version_introduced`, `enabled`) VALUES
+(700, 'PLG_SYSTEM_UPDATENOTIFICATION_POSTINSTALL_UPDATECACHETIME', 'PLG_SYSTEM_UPDATENOTIFICATION_POSTINSTALL_UPDATECACHETIME_BODY', 'PLG_SYSTEM_UPDATENOTIFICATION_POSTINSTALL_UPDATECACHETIME_ACTION', 'plg_system_updatenotification', 1, 'action', 'site://plugins/system/updatenotification/postinstall/updatecachetime.php', 'updatecachetime_postinstall_action', 'site://plugins/system/updatenotification/postinstall/updatecachetime.php', 'updatecachetime_postinstall_condition', '3.6.3', 1);
\ No newline at end of file
diff --git a/administrator/components/com_admin/sql/updates/postgresql/3.6.3-2016-08-16.sql b/administrator/components/com_admin/sql/updates/postgresql/3.6.3-2016-08-16.sql
new file mode 100644
index 0000000000000..2fd8013e07427
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/postgresql/3.6.3-2016-08-16.sql
@@ -0,0 +1,2 @@
+INSERT INTO "#__postinstall_messages" ("extension_id", "title_key", "description_key", "action_key", "language_extension", "language_client_id", "type", "action_file", "action", "condition_file", "condition_method", "version_introduced", "enabled") VALUES
+(700, 'PLG_SYSTEM_UPDATENOTIFICATION_POSTINSTALL_UPDATECACHETIME', 'PLG_SYSTEM_UPDATENOTIFICATION_POSTINSTALL_UPDATECACHETIME_BODY', 'PLG_SYSTEM_UPDATENOTIFICATION_POSTINSTALL_UPDATECACHETIME_ACTION', 'plg_system_updatenotification', 1, 'action', 'site://plugins/system/updatenotification/postinstall/updatecachetime.php', 'updatecachetime_postinstall_action', 'site://plugins/system/updatenotification/postinstall/updatecachetime.php', 'updatecachetime_postinstall_condition', '3.6.3', 1);
\ No newline at end of file
diff --git a/administrator/components/com_admin/sql/updates/sqlazure/3.6.3-2016-08-16.sql b/administrator/components/com_admin/sql/updates/sqlazure/3.6.3-2016-08-16.sql
new file mode 100644
index 0000000000000..5d54b148401bf
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/sqlazure/3.6.3-2016-08-16.sql
@@ -0,0 +1,2 @@
+INSERT INTO [#__postinstall_messages] ([extension_id], [title_key], [description_key], [action_key], [language_extension], [language_client_id], [type], [action_file], [action], [condition_file], [condition_method], [version_introduced], [enabled])
+SELECT 700, 'PLG_SYSTEM_UPDATENOTIFICATION_POSTINSTALL_UPDATECACHETIME', 'PLG_SYSTEM_UPDATENOTIFICATION_POSTINSTALL_UPDATECACHETIME_BODY', 'PLG_SYSTEM_UPDATENOTIFICATION_POSTINSTALL_UPDATECACHETIME_ACTION', 'plg_system_updatenotification', 1, 'action', 'site://plugins/system/updatenotification/postinstall/updatecachetime.php', 'updatecachetime_postinstall_action', 'site://plugins/system/updatenotification/postinstall/updatecachetime.php', 'updatecachetime_postinstall_condition', '3.6.3', 1;
\ No newline at end of file
diff --git a/administrator/language/en-GB/en-GB.plg_system_updatenotification.ini b/administrator/language/en-GB/en-GB.plg_system_updatenotification.ini
index a382d7849c3de..94227ed393176 100644
--- a/administrator/language/en-GB/en-GB.plg_system_updatenotification.ini
+++ b/administrator/language/en-GB/en-GB.plg_system_updatenotification.ini
@@ -6,9 +6,6 @@
 PLG_SYSTEM_UPDATENOTIFICATION="System - Joomla! Update Notification"
 PLG_SYSTEM_UPDATENOTIFICATION_EMAIL_LBL="Super User Emails"
 PLG_SYSTEM_UPDATENOTIFICATION_EMAIL_DESC="A comma separated list of the email addresses which will receive the update notification emails. The addresses in the list MUST belong to existing users of your site who have the Super User privilege. If none of the listed emails belongs to Super Users, or if it's left blank, all Super Users of this site will receive the update notification email."
-PLG_SYSTEM_UPDATENOTIFICATION_LANGUAGE_OVERRIDE_LBL="Email Language"
-PLG_SYSTEM_UPDATENOTIFICATION_LANGUAGE_OVERRIDE_DESC="If you choose Auto (default), the update notification email to Super Users will be in the site language at the time the plugin is triggered. By selecting a language here you are forcing the update notification emails to be sent in this specific language."
-PLG_SYSTEM_UPDATENOTIFICATION_LANGUAGE_OVERRIDE_NONE="Auto"
 ; You can use the following merge codes:
 ; [NEWVERSION]		New Joomla! version, e.g. 1.2.3
 ; [CURVERSION]		Currently installed Joomla! version, e.g. 1.2.0
@@ -18,4 +15,10 @@ PLG_SYSTEM_UPDATENOTIFICATION_LANGUAGE_OVERRIDE_NONE="Auto"
 ; \n				Newline character. Use it to start a new line in the email.
 PLG_SYSTEM_UPDATENOTIFICATION_EMAIL_SUBJECT="Joomla! Update available for [SITENAME] – [URL]"
 PLG_SYSTEM_UPDATENOTIFICATION_EMAIL_BODY="This email IS NOT sent by Joomla.org. It is sent automatically by your own site,\n[SITENAME] - [URL] \n\n================================================================================\nUPDATE INFORMATION\n================================================================================\n\nYour site has discovered that there is an updated version of Joomla! available for download.\n\nJoomla! version currently installed:        [CURVERSION]\nJoomla! version available for installation: [NEWVERSION]\n\nThis email is sent to you by your site to remind you of this fact.\nThe Joomla! project will never contact you directly about available updates of Joomla! on your site.\n\n================================================================================\nUPDATE INSTRUCTIONS\n================================================================================\n\nTo install the update on [SITENAME] please click the following link. (If the URL is not a link, simply copy & paste it to your browser).\n\nUpdate link: [LINK]\n\n================================================================================\nWHY AM I RECEIVING THIS EMAIL?\n================================================================================\n\nThis email has been automatically sent by a plugin provided by Joomla!, the software which powers your site.\nThis plugin looks for updated versions of Joomla! and sends an email notification to its administrators.\nYou will receive several similar emails from your site until you either update the software or disable these emails.\n\nTo disable these emails, please unpublish the 'System - Joomla! Update Notification' plugin in the Plugin Manager on your site.\n\nIf you do not understand what Joomla! is and what you need to do please do not contact the Joomla! project.\nThey are NOT sending you this email and they cannot help you. Instead, please contact the person who built or manages your site.\n\nIf you are the person who built or manages your website, please note that this plugin may have been activated automatically when you installed or updated Joomla! on your site.\n\n================================================================================\nWHO SENT ME THIS EMAIL?\n================================================================================\n\nThis email is sent to you by your own site, [SITENAME]"
+PLG_SYSTEM_UPDATENOTIFICATION_LANGUAGE_OVERRIDE_LBL="Email Language"
+PLG_SYSTEM_UPDATENOTIFICATION_LANGUAGE_OVERRIDE_DESC="If you choose Auto (default), the update notification email to Super Users will be in the site language at the time the plugin is triggered. By selecting a language here you are forcing the update notification emails to be sent in this specific language."
+PLG_SYSTEM_UPDATENOTIFICATION_LANGUAGE_OVERRIDE_NONE="Auto"
+PLG_SYSTEM_UPDATENOTIFICATION_POSTINSTALL_UPDATECACHETIME="The Joomla! Update Notification will not run in this configuration"
+PLG_SYSTEM_UPDATENOTIFICATION_POSTINSTALL_UPDATECACHETIME_BODY="In your Installer Configuration you have set the Option Update Cache (in Hours) to 0 this means that Joomla is not caching the Update. This means an email should be sent on every page visit but this is not possible. Please increase the value (6 is default) or confirm that the Joomla! Update Notification will never send you mails."
+PLG_SYSTEM_UPDATENOTIFICATION_POSTINSTALL_UPDATECACHETIME_ACTION="Set it back to the default setting (6 Hours)"
 PLG_SYSTEM_UPDATENOTIFICATION_XML_DESCRIPTION="This plugin periodically checks for the availability of new Joomla! versions. When one is found it will send you an email, reminding you to update Joomla!. Pro Tip: You can customise the email message by overriding the language string keys PLG_SYSTEM_UPDATENOTIFICATION_EMAIL_SUBJECT and PLG_SYSTEM_UPDATENOTIFICATION_EMAIL_BODY."
diff --git a/installation/sql/mysql/joomla.sql b/installation/sql/mysql/joomla.sql
index 21e132698a899..0f73ae84b0cf8 100644
--- a/installation/sql/mysql/joomla.sql
+++ b/installation/sql/mysql/joomla.sql
@@ -1514,7 +1514,8 @@ CREATE TABLE IF NOT EXISTS `#__postinstall_messages` (
 INSERT INTO `#__postinstall_messages` (`extension_id`, `title_key`, `description_key`, `action_key`, `language_extension`, `language_client_id`, `type`, `action_file`, `action`, `condition_file`, `condition_method`, `version_introduced`, `enabled`) VALUES
 (700, 'PLG_TWOFACTORAUTH_TOTP_POSTINSTALL_TITLE', 'PLG_TWOFACTORAUTH_TOTP_POSTINSTALL_BODY', 'PLG_TWOFACTORAUTH_TOTP_POSTINSTALL_ACTION', 'plg_twofactorauth_totp', 1, 'action', 'site://plugins/twofactorauth/totp/postinstall/actions.php', 'twofactorauth_postinstall_action', 'site://plugins/twofactorauth/totp/postinstall/actions.php', 'twofactorauth_postinstall_condition', '3.2.0', 1),
 (700, 'COM_CPANEL_WELCOME_BEGINNERS_TITLE', 'COM_CPANEL_WELCOME_BEGINNERS_MESSAGE', '', 'com_cpanel', 1, 'message', '', '', '', '', '3.2.0', 1),
-(700, 'COM_CPANEL_MSG_STATS_COLLECTION_TITLE', 'COM_CPANEL_MSG_STATS_COLLECTION_BODY', '', 'com_cpanel', 1, 'message', '', '', 'admin://components/com_admin/postinstall/statscollection.php', 'admin_postinstall_statscollection_condition', '3.5.0', 1);
+(700, 'COM_CPANEL_MSG_STATS_COLLECTION_TITLE', 'COM_CPANEL_MSG_STATS_COLLECTION_BODY', '', 'com_cpanel', 1, 'message', '', '', 'admin://components/com_admin/postinstall/statscollection.php', 'admin_postinstall_statscollection_condition', '3.5.0', 1),
+(700, 'PLG_SYSTEM_UPDATENOTIFICATION_POSTINSTALL_UPDATECACHETIME', 'PLG_SYSTEM_UPDATENOTIFICATION_POSTINSTALL_UPDATECACHETIME_BODY', 'PLG_SYSTEM_UPDATENOTIFICATION_POSTINSTALL_UPDATECACHETIME_ACTION', 'plg_system_updatenotification', 1, 'action', 'site://plugins/system/updatenotification/postinstall/updatecachetime.php', 'updatecachetime_postinstall_action', 'site://plugins/system/updatenotification/postinstall/updatecachetime.php', 'updatecachetime_postinstall_condition', '3.6.3', 1);
 
 -- --------------------------------------------------------
 
diff --git a/installation/sql/postgresql/joomla.sql b/installation/sql/postgresql/joomla.sql
index fa82227222123..3b233efc654ea 100644
--- a/installation/sql/postgresql/joomla.sql
+++ b/installation/sql/postgresql/joomla.sql
@@ -1458,7 +1458,8 @@ COMMENT ON COLUMN "#__postinstall_messages"."version_introduced" IS 'Version whe
 INSERT INTO "#__postinstall_messages" ("extension_id", "title_key", "description_key", "action_key", "language_extension", "language_client_id", "type", "action_file", "action", "condition_file", "condition_method", "version_introduced", "enabled") VALUES
 (700, 'PLG_TWOFACTORAUTH_TOTP_POSTINSTALL_TITLE', 'PLG_TWOFACTORAUTH_TOTP_POSTINSTALL_BODY', 'PLG_TWOFACTORAUTH_TOTP_POSTINSTALL_ACTION', 'plg_twofactorauth_totp', 1, 'action', 'site://plugins/twofactorauth/totp/postinstall/actions.php', 'twofactorauth_postinstall_action', 'site://plugins/twofactorauth/totp/postinstall/actions.php', 'twofactorauth_postinstall_condition', '3.2.0', 1),
 (700, 'COM_CPANEL_WELCOME_BEGINNERS_TITLE', 'COM_CPANEL_WELCOME_BEGINNERS_MESSAGE', '', 'com_cpanel', 1, 'message', '', '', '', '', '3.2.0', 1),
-(700, 'COM_CPANEL_MSG_STATS_COLLECTION_TITLE', 'COM_CPANEL_MSG_STATS_COLLECTION_BODY', '', 'com_cpanel', 1, 'message', '', '', 'admin://components/com_admin/postinstall/statscollection.php', 'admin_postinstall_statscollection_condition', '3.5.0', 1);
+(700, 'COM_CPANEL_MSG_STATS_COLLECTION_TITLE', 'COM_CPANEL_MSG_STATS_COLLECTION_BODY', '', 'com_cpanel', 1, 'message', '', '', 'admin://components/com_admin/postinstall/statscollection.php', 'admin_postinstall_statscollection_condition', '3.5.0', 1),
+(700, 'PLG_SYSTEM_UPDATENOTIFICATION_POSTINSTALL_UPDATECACHETIME', 'PLG_SYSTEM_UPDATENOTIFICATION_POSTINSTALL_UPDATECACHETIME_BODY', 'PLG_SYSTEM_UPDATENOTIFICATION_POSTINSTALL_UPDATECACHETIME_ACTION', 'plg_system_updatenotification', 1, 'action', 'site://plugins/system/updatenotification/postinstall/updatecachetime.php', 'updatecachetime_postinstall_action', 'site://plugins/system/updatenotification/postinstall/updatecachetime.php', 'updatecachetime_postinstall_condition', '3.6.3', 1);
 
 --
 -- Table: #__redirect_links
diff --git a/installation/sql/sqlazure/joomla.sql b/installation/sql/sqlazure/joomla.sql
index 685c0c84c8e4e..35e43496f6f48 100644
--- a/installation/sql/sqlazure/joomla.sql
+++ b/installation/sql/sqlazure/joomla.sql
@@ -2338,7 +2338,9 @@ SELECT 700, 'PLG_TWOFACTORAUTH_TOTP_POSTINSTALL_TITLE', 'PLG_TWOFACTORAUTH_TOTP_
 UNION ALL
 SELECT 700, 'COM_CPANEL_WELCOME_BEGINNERS_TITLE', 'COM_CPANEL_WELCOME_BEGINNERS_MESSAGE', '', 'com_cpanel', 1, 'message', '', '', '', '', '3.2.0', 1
 UNION ALL
-SELECT 700, 'COM_CPANEL_MSG_STATS_COLLECTION_TITLE', 'COM_CPANEL_MSG_STATS_COLLECTION_BODY', '', 'com_cpanel', 1, 'message', '', '', 'admin://components/com_admin/postinstall/statscollection.php', 'admin_postinstall_statscollection_condition', '3.5.0', 1;
+SELECT 700, 'COM_CPANEL_MSG_STATS_COLLECTION_TITLE', 'COM_CPANEL_MSG_STATS_COLLECTION_BODY', '', 'com_cpanel', 1, 'message', '', '', 'admin://components/com_admin/postinstall/statscollection.php', 'admin_postinstall_statscollection_condition', '3.5.0', 1
+UNION ALL
+SELECT 700, 'PLG_SYSTEM_UPDATENOTIFICATION_POSTINSTALL_UPDATECACHETIME', 'PLG_SYSTEM_UPDATENOTIFICATION_POSTINSTALL_UPDATECACHETIME_BODY', 'PLG_SYSTEM_UPDATENOTIFICATION_POSTINSTALL_UPDATECACHETIME_ACTION', 'plg_system_updatenotification', 1, 'action', 'site://plugins/system/updatenotification/postinstall/updatecachetime.php', 'updatecachetime_postinstall_action', 'site://plugins/system/updatenotification/postinstall/updatecachetime.php', 'updatecachetime_postinstall_condition', '3.6.3', 1;
 
 /****** Object:  Table [#__redirect_links] ******/
 SET QUOTED_IDENTIFIER ON;
diff --git a/plugins/system/updatenotification/postinstall/updatecachetime.php b/plugins/system/updatenotification/postinstall/updatecachetime.php
new file mode 100644
index 0000000000000..70f17a3811b97
--- /dev/null
+++ b/plugins/system/updatenotification/postinstall/updatecachetime.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  System.updatenotification
+ *
+ * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+/**
+ * Checks if the com_installer config for the cache Hours are eq 0 and the updatenotification Plugin is enabled
+ *
+ * @return  boolean
+ *
+ * @since   __DEPLOY_VERSION__
+ */
+function updatecachetime_postinstall_condition()
+{
+	$cacheTimeout = (int) JComponentHelper::getComponent('com_installer')->params->get('cachetimeout', 6);
+
+	// Check if cachetimeout is eq zero
+	if ($cacheTimeout == 0 && JPluginHelper::isEnabled('system', 'updatenotification'))
+	{
+		return true;
+	}
+
+	return false;
+}
+
+/**
+ * Sets the cachtimeout back to the default (6 hours)
+ *
+ * @return  void
+ *
+ * @since   __DEPLOY_VERSION__
+ */
+function updatecachetime_postinstall_action()
+{
+	$installer = JComponentHelper::getComponent('com_installer');
+
+	// Sets the cachtimeout back to the default (6 hours)
+	$installer->params->set('cachetimeout', 6);
+	
+	// Save the new parameters back to com_installer
+	$table = JTable::getInstance('extension');
+	$table->load($installer->id);
+	$table->bind(array('params' => $installer->params->toString()));
+
+	// Store the changes
+	if (!$table->store())
+	{
+		// If there is a error show it to the admin
+		JFactory::getApplication()->enqueueMessage($table->getError(), 'error');
+	}
+}
diff --git a/plugins/system/updatenotification/updatenotification.php b/plugins/system/updatenotification/updatenotification.php
index 86c8099d8d9ee..3be554507c17a 100644
--- a/plugins/system/updatenotification/updatenotification.php
+++ b/plugins/system/updatenotification/updatenotification.php
@@ -25,6 +25,14 @@
  */
 class PlgSystemUpdatenotification extends JPlugin
 {
+	/**
+	 * Load plugin language files automatically
+	 *
+	 * @var    boolean
+	 * @since  __DEPLOY_VERSION__
+	 */
+	protected $autoloadLanguage = true;
+
 	/**
 	 * The update check and notification email code is triggered after the page has fully rendered.
 	 *

From 326e3a339309d93d11897a774f10394cb0706f8b Mon Sep 17 00:00:00 2001
From: Michael Babker <mbabker@flbab.com>
Date: Sat, 20 Aug 2016 15:07:25 -0500
Subject: [PATCH 09/13] Don't include autoloaded files in tests (#11693)

two successful tests besides my test so merging
---
 tests/unit/suites/libraries/joomla/JFactoryTest.php          | 2 --
 .../document/feed/renderer/JDocumentRendererAtomTest.php     | 4 ----
 .../document/feed/renderer/JDocumentRendererRSSTest.php      | 5 -----
 .../libraries/joomla/filesystem/JFilesystemPatcherTest.php   | 1 -
 .../suites/libraries/joomla/github/JGithubCommitsTest.php    | 4 ----
 .../unit/suites/libraries/joomla/github/JGithubForksTest.php | 4 ----
 .../unit/suites/libraries/joomla/github/JGithubHttpTest.php  | 3 ---
 .../suites/libraries/joomla/github/JGithubObjectTest.php     | 2 --
 .../unit/suites/libraries/joomla/github/JGithubRefsTest.php  | 4 ----
 tests/unit/suites/libraries/joomla/github/JGithubTest.php    | 2 --
 .../suites/libraries/joomla/language/JLanguageInspector.php  | 2 --
 .../libraries/joomla/linkedin/JLinkedinCompaniesTest.php     | 2 --
 .../suites/libraries/joomla/linkedin/JLinkedinGroupsTest.php | 2 --
 .../suites/libraries/joomla/linkedin/JLinkedinJobsTest.php   | 2 --
 .../suites/libraries/joomla/linkedin/JLinkedinOAuthTest.php  | 2 --
 .../suites/libraries/joomla/linkedin/JLinkedinObjectTest.php | 1 -
 .../suites/libraries/joomla/linkedin/JLinkedinPeopleTest.php | 2 --
 .../suites/libraries/joomla/linkedin/JLinkedinStreamTest.php | 2 --
 .../unit/suites/libraries/joomla/linkedin/JLinkedinTest.php  | 2 --
 tests/unit/suites/libraries/joomla/mail/JMailHelperTest.php  | 2 --
 .../libraries/joomla/mediawiki/JMediawikiCategoriesTest.php  | 4 ----
 .../suites/libraries/joomla/mediawiki/JMediawikiHttpTest.php | 3 ---
 .../libraries/joomla/mediawiki/JMediawikiImagesTest.php      | 4 ----
 .../libraries/joomla/mediawiki/JMediawikiLinksTest.php       | 4 ----
 .../libraries/joomla/mediawiki/JMediawikiObjectTest.php      | 2 --
 .../libraries/joomla/mediawiki/JMediawikiPagesTest.php       | 4 ----
 .../libraries/joomla/mediawiki/JMediawikiSearchTest.php      | 4 ----
 .../libraries/joomla/mediawiki/JMediawikiSitesTest.php       | 4 ----
 .../suites/libraries/joomla/mediawiki/JMediawikiTest.php     | 2 --
 .../libraries/joomla/mediawiki/JMediawikiUsersTest.php       | 4 ----
 .../suites/libraries/joomla/session/JSessionStorageTest.php  | 2 --
 .../joomla/session/storage/JSessionStorageDatabaseTest.php   | 2 --
 .../joomla/session/storage/JSessionStorageNoneTest.php       | 2 --
 .../suites/libraries/joomla/table/JTableExtensionTest.php    | 2 --
 .../suites/libraries/joomla/table/JTableLanguageTest.php     | 2 --
 tests/unit/suites/libraries/joomla/table/JTableUserTest.php  | 2 --
 36 files changed, 97 deletions(-)

diff --git a/tests/unit/suites/libraries/joomla/JFactoryTest.php b/tests/unit/suites/libraries/joomla/JFactoryTest.php
index a166a226c690d..e29528f45621d 100644
--- a/tests/unit/suites/libraries/joomla/JFactoryTest.php
+++ b/tests/unit/suites/libraries/joomla/JFactoryTest.php
@@ -6,8 +6,6 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-require_once JPATH_PLATFORM . '/joomla/factory.php';
-
 /**
  * Tests for JDate class.
  *
diff --git a/tests/unit/suites/libraries/joomla/document/feed/renderer/JDocumentRendererAtomTest.php b/tests/unit/suites/libraries/joomla/document/feed/renderer/JDocumentRendererAtomTest.php
index 7fda9ae98cab5..bb5154b39ed88 100644
--- a/tests/unit/suites/libraries/joomla/document/feed/renderer/JDocumentRendererAtomTest.php
+++ b/tests/unit/suites/libraries/joomla/document/feed/renderer/JDocumentRendererAtomTest.php
@@ -38,10 +38,6 @@ protected function setUp()
 
 		$this->markTestSkipped("Too tightly coupled to internals to be testable now");
 
-		require_once JPATH_PLATFORM . '/joomla/application/router.php';
-		require_once JPATH_PLATFORM . '/joomla/environment/request.php';
-		require_once JPATH_PLATFORM . '/joomla/document/feed/feed.php';
-		require_once JPATH_PLATFORM . '/joomla/environment/response.php';
 		$this->saveFactoryState();
 
 		JFactory::$application = $this->getMock(
diff --git a/tests/unit/suites/libraries/joomla/document/feed/renderer/JDocumentRendererRSSTest.php b/tests/unit/suites/libraries/joomla/document/feed/renderer/JDocumentRendererRSSTest.php
index f6d726277a66f..e657ba0898ddb 100644
--- a/tests/unit/suites/libraries/joomla/document/feed/renderer/JDocumentRendererRSSTest.php
+++ b/tests/unit/suites/libraries/joomla/document/feed/renderer/JDocumentRendererRSSTest.php
@@ -37,11 +37,6 @@ protected function setUp()
 
 		$this->markTestSkipped("Too tightly coupled to internals to be testable now");
 
-		require_once JPATH_PLATFORM . '/joomla/application/router.php';
-		require_once JPATH_PLATFORM . '/joomla/environment/request.php';
-		require_once JPATH_PLATFORM . '/joomla/document/feed/feed.php';
-		require_once JPATH_PLATFORM . '/joomla/environment/response.php';
-
 		$this->saveFactoryState();
 
 		JFactory::$application = $this->getMock(
diff --git a/tests/unit/suites/libraries/joomla/filesystem/JFilesystemPatcherTest.php b/tests/unit/suites/libraries/joomla/filesystem/JFilesystemPatcherTest.php
index 652e1ee327c4b..d989c487a8fa9 100644
--- a/tests/unit/suites/libraries/joomla/filesystem/JFilesystemPatcherTest.php
+++ b/tests/unit/suites/libraries/joomla/filesystem/JFilesystemPatcherTest.php
@@ -8,7 +8,6 @@
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
-require_once JPATH_PLATFORM . '/joomla/filesystem/patcher.php';
 require_once JPATH_PLATFORM . '/joomla/filesystem/path.php';
 
 /**
diff --git a/tests/unit/suites/libraries/joomla/github/JGithubCommitsTest.php b/tests/unit/suites/libraries/joomla/github/JGithubCommitsTest.php
index ba4403994378f..49508dd34e534 100644
--- a/tests/unit/suites/libraries/joomla/github/JGithubCommitsTest.php
+++ b/tests/unit/suites/libraries/joomla/github/JGithubCommitsTest.php
@@ -7,10 +7,6 @@
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
-require_once JPATH_PLATFORM . '/joomla/github/github.php';
-require_once JPATH_PLATFORM . '/joomla/github/http.php';
-require_once JPATH_PLATFORM . '/joomla/github/commits.php';
-
 /**
  * Test class for JGitHubCommits.
  *
diff --git a/tests/unit/suites/libraries/joomla/github/JGithubForksTest.php b/tests/unit/suites/libraries/joomla/github/JGithubForksTest.php
index 497aa45ee22bc..56b472e39479a 100644
--- a/tests/unit/suites/libraries/joomla/github/JGithubForksTest.php
+++ b/tests/unit/suites/libraries/joomla/github/JGithubForksTest.php
@@ -7,10 +7,6 @@
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
-require_once JPATH_PLATFORM . '/joomla/github/github.php';
-require_once JPATH_PLATFORM . '/joomla/github/http.php';
-require_once JPATH_PLATFORM . '/joomla/github/forks.php';
-
 /**
  * Test class for JGithubGists.
  *
diff --git a/tests/unit/suites/libraries/joomla/github/JGithubHttpTest.php b/tests/unit/suites/libraries/joomla/github/JGithubHttpTest.php
index b79f292ead03c..bfb2c43669614 100644
--- a/tests/unit/suites/libraries/joomla/github/JGithubHttpTest.php
+++ b/tests/unit/suites/libraries/joomla/github/JGithubHttpTest.php
@@ -7,9 +7,6 @@
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
-require_once JPATH_PLATFORM . '/joomla/github/http.php';
-require_once JPATH_PLATFORM . '/joomla/http/transport/stream.php';
-
 /**
  * Test class for JGithub.
  *
diff --git a/tests/unit/suites/libraries/joomla/github/JGithubObjectTest.php b/tests/unit/suites/libraries/joomla/github/JGithubObjectTest.php
index e4ff721a7e258..3e9a266a98dc0 100644
--- a/tests/unit/suites/libraries/joomla/github/JGithubObjectTest.php
+++ b/tests/unit/suites/libraries/joomla/github/JGithubObjectTest.php
@@ -7,8 +7,6 @@
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
-require_once JPATH_PLATFORM . '/joomla/github/http.php';
-require_once JPATH_PLATFORM . '/joomla/github/object.php';
 require_once __DIR__ . '/stubs/JGithubObjectMock.php';
 
 /**
diff --git a/tests/unit/suites/libraries/joomla/github/JGithubRefsTest.php b/tests/unit/suites/libraries/joomla/github/JGithubRefsTest.php
index 7125d64f42100..99cbd2b52f12a 100644
--- a/tests/unit/suites/libraries/joomla/github/JGithubRefsTest.php
+++ b/tests/unit/suites/libraries/joomla/github/JGithubRefsTest.php
@@ -7,10 +7,6 @@
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
-require_once JPATH_PLATFORM . '/joomla/github/github.php';
-require_once JPATH_PLATFORM . '/joomla/github/http.php';
-require_once JPATH_PLATFORM . '/joomla/github/refs.php';
-
 /**
  * Test class for JGithubGists.
  *
diff --git a/tests/unit/suites/libraries/joomla/github/JGithubTest.php b/tests/unit/suites/libraries/joomla/github/JGithubTest.php
index 94a77c658c3cb..d03c119ccf500 100644
--- a/tests/unit/suites/libraries/joomla/github/JGithubTest.php
+++ b/tests/unit/suites/libraries/joomla/github/JGithubTest.php
@@ -7,8 +7,6 @@
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
-require_once JPATH_PLATFORM . '/joomla/github/github.php';
-
 /**
  * Test class for JGithub.
  *
diff --git a/tests/unit/suites/libraries/joomla/language/JLanguageInspector.php b/tests/unit/suites/libraries/joomla/language/JLanguageInspector.php
index cc4723611050c..7889633bd7a7d 100644
--- a/tests/unit/suites/libraries/joomla/language/JLanguageInspector.php
+++ b/tests/unit/suites/libraries/joomla/language/JLanguageInspector.php
@@ -6,8 +6,6 @@
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
-require_once JPATH_PLATFORM . '/joomla/language/language.php';
-
 /**
  * Inspector for the JLanguage class.
  *
diff --git a/tests/unit/suites/libraries/joomla/linkedin/JLinkedinCompaniesTest.php b/tests/unit/suites/libraries/joomla/linkedin/JLinkedinCompaniesTest.php
index 880310c6e3ba7..b2be5f4b376cb 100644
--- a/tests/unit/suites/libraries/joomla/linkedin/JLinkedinCompaniesTest.php
+++ b/tests/unit/suites/libraries/joomla/linkedin/JLinkedinCompaniesTest.php
@@ -7,8 +7,6 @@
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
-require_once JPATH_PLATFORM . '/joomla/linkedin/companies.php';
-
 /**
  * Test class for JLinkedinCompanies.
  *
diff --git a/tests/unit/suites/libraries/joomla/linkedin/JLinkedinGroupsTest.php b/tests/unit/suites/libraries/joomla/linkedin/JLinkedinGroupsTest.php
index 3592446cd66a7..20e07f6eac29c 100644
--- a/tests/unit/suites/libraries/joomla/linkedin/JLinkedinGroupsTest.php
+++ b/tests/unit/suites/libraries/joomla/linkedin/JLinkedinGroupsTest.php
@@ -7,8 +7,6 @@
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
-require_once JPATH_PLATFORM . '/joomla/linkedin/groups.php';
-
 /**
  * Test class for JLinkedinGroups.
  *
diff --git a/tests/unit/suites/libraries/joomla/linkedin/JLinkedinJobsTest.php b/tests/unit/suites/libraries/joomla/linkedin/JLinkedinJobsTest.php
index ab0973869da0b..eafd8b583b575 100644
--- a/tests/unit/suites/libraries/joomla/linkedin/JLinkedinJobsTest.php
+++ b/tests/unit/suites/libraries/joomla/linkedin/JLinkedinJobsTest.php
@@ -7,8 +7,6 @@
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
-require_once JPATH_PLATFORM . '/joomla/linkedin/jobs.php';
-
 /**
  * Test class for JLinkedinJobs.
  *
diff --git a/tests/unit/suites/libraries/joomla/linkedin/JLinkedinOAuthTest.php b/tests/unit/suites/libraries/joomla/linkedin/JLinkedinOAuthTest.php
index 5330a52e41447..a49ecdbc1b6bf 100644
--- a/tests/unit/suites/libraries/joomla/linkedin/JLinkedinOAuthTest.php
+++ b/tests/unit/suites/libraries/joomla/linkedin/JLinkedinOAuthTest.php
@@ -7,8 +7,6 @@
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
-require_once JPATH_PLATFORM . '/joomla/linkedin/oauth.php';
-
 /**
  * Test class for JLinkedinOAuth.
  *
diff --git a/tests/unit/suites/libraries/joomla/linkedin/JLinkedinObjectTest.php b/tests/unit/suites/libraries/joomla/linkedin/JLinkedinObjectTest.php
index 53f2ca098c4cc..dd4194b3824fb 100644
--- a/tests/unit/suites/libraries/joomla/linkedin/JLinkedinObjectTest.php
+++ b/tests/unit/suites/libraries/joomla/linkedin/JLinkedinObjectTest.php
@@ -7,7 +7,6 @@
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
-require_once JPATH_PLATFORM . '/joomla/linkedin/object.php';
 require_once __DIR__ . '/stubs/JLinkedinObjectMock.php';
 
 /**
diff --git a/tests/unit/suites/libraries/joomla/linkedin/JLinkedinPeopleTest.php b/tests/unit/suites/libraries/joomla/linkedin/JLinkedinPeopleTest.php
index 668115b9054ec..3ee696baf7c78 100644
--- a/tests/unit/suites/libraries/joomla/linkedin/JLinkedinPeopleTest.php
+++ b/tests/unit/suites/libraries/joomla/linkedin/JLinkedinPeopleTest.php
@@ -7,8 +7,6 @@
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
-require_once JPATH_PLATFORM . '/joomla/linkedin/people.php';
-
 /**
  * Test class for JLinkedinPeople.
  *
diff --git a/tests/unit/suites/libraries/joomla/linkedin/JLinkedinStreamTest.php b/tests/unit/suites/libraries/joomla/linkedin/JLinkedinStreamTest.php
index dae8eb9f59ece..22215852de897 100644
--- a/tests/unit/suites/libraries/joomla/linkedin/JLinkedinStreamTest.php
+++ b/tests/unit/suites/libraries/joomla/linkedin/JLinkedinStreamTest.php
@@ -7,8 +7,6 @@
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
-require_once JPATH_PLATFORM . '/joomla/linkedin/stream.php';
-
 /**
  * Test class for JLinkedinStream.
  *
diff --git a/tests/unit/suites/libraries/joomla/linkedin/JLinkedinTest.php b/tests/unit/suites/libraries/joomla/linkedin/JLinkedinTest.php
index bb5836ac30915..5748c31fd0a22 100644
--- a/tests/unit/suites/libraries/joomla/linkedin/JLinkedinTest.php
+++ b/tests/unit/suites/libraries/joomla/linkedin/JLinkedinTest.php
@@ -7,8 +7,6 @@
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
-require_once JPATH_PLATFORM . '/joomla/linkedin/linkedin.php';
-
 /**
  * Test class for JLinkedin.
  *
diff --git a/tests/unit/suites/libraries/joomla/mail/JMailHelperTest.php b/tests/unit/suites/libraries/joomla/mail/JMailHelperTest.php
index 9f555200b97ac..495e9ab7070f8 100644
--- a/tests/unit/suites/libraries/joomla/mail/JMailHelperTest.php
+++ b/tests/unit/suites/libraries/joomla/mail/JMailHelperTest.php
@@ -6,8 +6,6 @@
  * @license    GNU General Public License version 2 or later; see LICENSE
  */
 
-include_once JPATH_PLATFORM . '/joomla/mail/helper.php';
-
 /**
  * Test class for JMailHelper.
  * Generated by PHPUnit on 2011-10-26 at 19:33:00.
diff --git a/tests/unit/suites/libraries/joomla/mediawiki/JMediawikiCategoriesTest.php b/tests/unit/suites/libraries/joomla/mediawiki/JMediawikiCategoriesTest.php
index 04994ac03a7a6..c4118bf88817d 100644
--- a/tests/unit/suites/libraries/joomla/mediawiki/JMediawikiCategoriesTest.php
+++ b/tests/unit/suites/libraries/joomla/mediawiki/JMediawikiCategoriesTest.php
@@ -7,10 +7,6 @@
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
-require_once JPATH_PLATFORM . '/joomla/mediawiki/mediawiki.php';
-require_once JPATH_PLATFORM . '/joomla/mediawiki/http.php';
-require_once JPATH_PLATFORM . '/joomla/mediawiki/categories.php';
-
 /**
  * Test class for JMediawikiCategories.
  *
diff --git a/tests/unit/suites/libraries/joomla/mediawiki/JMediawikiHttpTest.php b/tests/unit/suites/libraries/joomla/mediawiki/JMediawikiHttpTest.php
index 1f9fb2f1851e7..9bc9534d5f06d 100644
--- a/tests/unit/suites/libraries/joomla/mediawiki/JMediawikiHttpTest.php
+++ b/tests/unit/suites/libraries/joomla/mediawiki/JMediawikiHttpTest.php
@@ -7,9 +7,6 @@
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
-require_once JPATH_PLATFORM . '/joomla/mediawiki/http.php';
-require_once JPATH_PLATFORM . '/joomla/http/transport/stream.php';
-
 /**
  * Test class for JMediawikiHttp.
  *
diff --git a/tests/unit/suites/libraries/joomla/mediawiki/JMediawikiImagesTest.php b/tests/unit/suites/libraries/joomla/mediawiki/JMediawikiImagesTest.php
index d31d7c5d06317..1b94e0acc3fe7 100644
--- a/tests/unit/suites/libraries/joomla/mediawiki/JMediawikiImagesTest.php
+++ b/tests/unit/suites/libraries/joomla/mediawiki/JMediawikiImagesTest.php
@@ -7,10 +7,6 @@
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
-require_once JPATH_PLATFORM . '/joomla/mediawiki/mediawiki.php';
-require_once JPATH_PLATFORM . '/joomla/mediawiki/http.php';
-require_once JPATH_PLATFORM . '/joomla/mediawiki/images.php';
-
 /**
  * Test class for JMediawikiImages.
  *
diff --git a/tests/unit/suites/libraries/joomla/mediawiki/JMediawikiLinksTest.php b/tests/unit/suites/libraries/joomla/mediawiki/JMediawikiLinksTest.php
index 3e607dab38e3e..d11a9aec121fb 100644
--- a/tests/unit/suites/libraries/joomla/mediawiki/JMediawikiLinksTest.php
+++ b/tests/unit/suites/libraries/joomla/mediawiki/JMediawikiLinksTest.php
@@ -7,10 +7,6 @@
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
-require_once JPATH_PLATFORM . '/joomla/mediawiki/mediawiki.php';
-require_once JPATH_PLATFORM . '/joomla/mediawiki/http.php';
-require_once JPATH_PLATFORM . '/joomla/mediawiki/links.php';
-
 /**
  * Test class for JMediawikiLinks.
  *
diff --git a/tests/unit/suites/libraries/joomla/mediawiki/JMediawikiObjectTest.php b/tests/unit/suites/libraries/joomla/mediawiki/JMediawikiObjectTest.php
index 823fb0449519c..1489ca1b846ac 100644
--- a/tests/unit/suites/libraries/joomla/mediawiki/JMediawikiObjectTest.php
+++ b/tests/unit/suites/libraries/joomla/mediawiki/JMediawikiObjectTest.php
@@ -7,8 +7,6 @@
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
-require_once JPATH_PLATFORM . '/joomla/mediawiki/http.php';
-require_once JPATH_PLATFORM . '/joomla/mediawiki/object.php';
 require_once __DIR__ . '/stubs/JMediawikiObjectMock.php';
 
 /**
diff --git a/tests/unit/suites/libraries/joomla/mediawiki/JMediawikiPagesTest.php b/tests/unit/suites/libraries/joomla/mediawiki/JMediawikiPagesTest.php
index e943be5475cae..e6bdae9bef87c 100644
--- a/tests/unit/suites/libraries/joomla/mediawiki/JMediawikiPagesTest.php
+++ b/tests/unit/suites/libraries/joomla/mediawiki/JMediawikiPagesTest.php
@@ -7,10 +7,6 @@
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
-require_once JPATH_PLATFORM . '/joomla/mediawiki/mediawiki.php';
-require_once JPATH_PLATFORM . '/joomla/mediawiki/http.php';
-require_once JPATH_PLATFORM . '/joomla/mediawiki/pages.php';
-
 /**
  * Test class for JMediawikiPages.
  *
diff --git a/tests/unit/suites/libraries/joomla/mediawiki/JMediawikiSearchTest.php b/tests/unit/suites/libraries/joomla/mediawiki/JMediawikiSearchTest.php
index 4c15fa65b3064..2fdcd57bdc6ad 100644
--- a/tests/unit/suites/libraries/joomla/mediawiki/JMediawikiSearchTest.php
+++ b/tests/unit/suites/libraries/joomla/mediawiki/JMediawikiSearchTest.php
@@ -7,10 +7,6 @@
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
-require_once JPATH_PLATFORM . '/joomla/mediawiki/mediawiki.php';
-require_once JPATH_PLATFORM . '/joomla/mediawiki/http.php';
-require_once JPATH_PLATFORM . '/joomla/mediawiki/search.php';
-
 /**
  * Test class for JMediawikiSearch.
  *
diff --git a/tests/unit/suites/libraries/joomla/mediawiki/JMediawikiSitesTest.php b/tests/unit/suites/libraries/joomla/mediawiki/JMediawikiSitesTest.php
index 0a51103e6116f..056c477999136 100644
--- a/tests/unit/suites/libraries/joomla/mediawiki/JMediawikiSitesTest.php
+++ b/tests/unit/suites/libraries/joomla/mediawiki/JMediawikiSitesTest.php
@@ -7,10 +7,6 @@
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
-require_once JPATH_PLATFORM . '/joomla/mediawiki/mediawiki.php';
-require_once JPATH_PLATFORM . '/joomla/mediawiki/http.php';
-require_once JPATH_PLATFORM . '/joomla/mediawiki/sites.php';
-
 /**
  * Test class for JMediawikiCategories.
  *
diff --git a/tests/unit/suites/libraries/joomla/mediawiki/JMediawikiTest.php b/tests/unit/suites/libraries/joomla/mediawiki/JMediawikiTest.php
index a44b6cca8f601..1885d3199dc68 100644
--- a/tests/unit/suites/libraries/joomla/mediawiki/JMediawikiTest.php
+++ b/tests/unit/suites/libraries/joomla/mediawiki/JMediawikiTest.php
@@ -7,8 +7,6 @@
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
-require_once JPATH_PLATFORM . '/joomla/mediawiki/mediawiki.php';
-
 /**
  * Test class for JMediawiki.
  *
diff --git a/tests/unit/suites/libraries/joomla/mediawiki/JMediawikiUsersTest.php b/tests/unit/suites/libraries/joomla/mediawiki/JMediawikiUsersTest.php
index 4ee0a6f89be63..e283e54366536 100644
--- a/tests/unit/suites/libraries/joomla/mediawiki/JMediawikiUsersTest.php
+++ b/tests/unit/suites/libraries/joomla/mediawiki/JMediawikiUsersTest.php
@@ -7,10 +7,6 @@
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
-require_once JPATH_PLATFORM . '/joomla/mediawiki/mediawiki.php';
-require_once JPATH_PLATFORM . '/joomla/mediawiki/http.php';
-require_once JPATH_PLATFORM . '/joomla/mediawiki/users.php';
-
 /**
  * Test class for JMediawikiUsers.
  *
diff --git a/tests/unit/suites/libraries/joomla/session/JSessionStorageTest.php b/tests/unit/suites/libraries/joomla/session/JSessionStorageTest.php
index c50d712995a9e..ebd54b3e4e801 100644
--- a/tests/unit/suites/libraries/joomla/session/JSessionStorageTest.php
+++ b/tests/unit/suites/libraries/joomla/session/JSessionStorageTest.php
@@ -6,8 +6,6 @@
  * @license    GNU General Public License version 2 or later; see LICENSE
  */
 
-include_once JPATH_PLATFORM . '/joomla/session/storage.php';
-
 /**
  * Test class for JSessionStorage.
  *
diff --git a/tests/unit/suites/libraries/joomla/session/storage/JSessionStorageDatabaseTest.php b/tests/unit/suites/libraries/joomla/session/storage/JSessionStorageDatabaseTest.php
index 279204750e350..56c9b341de95d 100644
--- a/tests/unit/suites/libraries/joomla/session/storage/JSessionStorageDatabaseTest.php
+++ b/tests/unit/suites/libraries/joomla/session/storage/JSessionStorageDatabaseTest.php
@@ -6,8 +6,6 @@
  * @license    GNU General Public License version 2 or later; see LICENSE
  */
 
-include_once JPATH_PLATFORM . '/joomla/session/storage.php';
-
 /**
  * Test class for JSessionStorageDatabase.
  *
diff --git a/tests/unit/suites/libraries/joomla/session/storage/JSessionStorageNoneTest.php b/tests/unit/suites/libraries/joomla/session/storage/JSessionStorageNoneTest.php
index b5675ba32239f..70331b8a78039 100644
--- a/tests/unit/suites/libraries/joomla/session/storage/JSessionStorageNoneTest.php
+++ b/tests/unit/suites/libraries/joomla/session/storage/JSessionStorageNoneTest.php
@@ -7,8 +7,6 @@
  * @license    GNU General Public License version 2 or later; see LICENSE
  */
 
-include_once JPATH_PLATFORM . '/joomla/session/storage.php';
-
 /**
  * Test class for JSessionStorageNone.
  *
diff --git a/tests/unit/suites/libraries/joomla/table/JTableExtensionTest.php b/tests/unit/suites/libraries/joomla/table/JTableExtensionTest.php
index fea04d95776a6..108a978f36541 100644
--- a/tests/unit/suites/libraries/joomla/table/JTableExtensionTest.php
+++ b/tests/unit/suites/libraries/joomla/table/JTableExtensionTest.php
@@ -7,8 +7,6 @@
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
-require_once JPATH_PLATFORM . '/joomla/table/extension.php';
-
 /**
  * Test class for JTableExtension.
  * Generated by PHPUnit on 2011-12-06 at 03:27:17.
diff --git a/tests/unit/suites/libraries/joomla/table/JTableLanguageTest.php b/tests/unit/suites/libraries/joomla/table/JTableLanguageTest.php
index 69e269560e997..4cd99183f7ca8 100644
--- a/tests/unit/suites/libraries/joomla/table/JTableLanguageTest.php
+++ b/tests/unit/suites/libraries/joomla/table/JTableLanguageTest.php
@@ -7,8 +7,6 @@
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
-require_once JPATH_PLATFORM . '/joomla/table/language.php';
-
 /**
  * Test class for JTableLanguage.
  * Generated by PHPUnit on 2011-12-06 at 03:29:18.
diff --git a/tests/unit/suites/libraries/joomla/table/JTableUserTest.php b/tests/unit/suites/libraries/joomla/table/JTableUserTest.php
index a11a11f8ba57c..ed312bbaec8e7 100644
--- a/tests/unit/suites/libraries/joomla/table/JTableUserTest.php
+++ b/tests/unit/suites/libraries/joomla/table/JTableUserTest.php
@@ -7,8 +7,6 @@
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
-require_once JPATH_PLATFORM . '/joomla/table/user.php';
-
 /**
  * Test class for JTableUser.
  * Generated by PHPUnit on 2011-12-06 at 03:44:10.

From b86512ea38bf0d777a512ded7ba9cb04a4479c9b Mon Sep 17 00:00:00 2001
From: Brian Teeman <brian@teeman.net>
Date: Sun, 21 Aug 2016 14:04:22 +0100
Subject: [PATCH 10/13] Improve accessibility for ISIS (#11704)

* toolbar

* Revert "toolbar"

This reverts commit 8f995f199efdfe8668c5f6d7f28a733076f89383.

* Improve accessibility for Isis

* typo
---
 administrator/language/en-GB/en-GB.tpl_isis.ini        |  2 ++
 administrator/templates/isis/css/template-rtl.css      |  8 ++++++++
 administrator/templates/isis/css/template.css          |  8 ++++++++
 administrator/templates/isis/index.php                 | 10 +++++++++-
 .../templates/isis/language/en-GB/en-GB.tpl_isis.ini   |  2 ++
 media/jui/css/bootstrap-extended.css                   |  8 ++++++++
 media/jui/less/bootstrap-extended.less                 | 10 ++++++++++
 templates/protostar/css/template.css                   |  8 ++++++++
 8 files changed, 55 insertions(+), 1 deletion(-)

diff --git a/administrator/language/en-GB/en-GB.tpl_isis.ini b/administrator/language/en-GB/en-GB.tpl_isis.ini
index 947b399303655..59938b866ab38 100644
--- a/administrator/language/en-GB/en-GB.tpl_isis.ini
+++ b/administrator/language/en-GB/en-GB.tpl_isis.ini
@@ -28,6 +28,8 @@ TPL_ISIS_LOGO_DESC="Upload a custom logo for the administrator template."
 TPL_ISIS_LOGO_LABEL="Logo"
 TPL_ISIS_LOGOUT="Logout"
 TPL_ISIS_PREVIEW="Preview %s"
+TPL_ISIS_SKIP_TO_MAIN_CONTENT="Skip to Main Content"
+TPL_ISIS_SKIP_TO_MAIN_CONTENT_HERE="Main content begins here"
 TPL_ISIS_STATUS_BOTTOM="Fixed bottom"
 TPL_ISIS_STATUS_DESC="Choose the location of the status module."
 TPL_ISIS_STATUS_LABEL="Status Module Position"
diff --git a/administrator/templates/isis/css/template-rtl.css b/administrator/templates/isis/css/template-rtl.css
index b0cc5ceffddbf..415fcfad84195 100644
--- a/administrator/templates/isis/css/template-rtl.css
+++ b/administrator/templates/isis/css/template-rtl.css
@@ -6137,6 +6137,14 @@ fieldset.radio.btn-group {
 	width: 1px;
 	overflow: hidden;
 }
+.element-invisible:focus {
+	width: auto;
+	height: auto;
+	overflow: auto;
+	background: #eee;
+	color: #000;
+	padding: 1em;
+}
 .form-vertical .control-label {
 	float: none;
 	width: auto;
diff --git a/administrator/templates/isis/css/template.css b/administrator/templates/isis/css/template.css
index 9adb231084d78..8202c5227e288 100644
--- a/administrator/templates/isis/css/template.css
+++ b/administrator/templates/isis/css/template.css
@@ -6137,6 +6137,14 @@ fieldset.radio.btn-group {
 	width: 1px;
 	overflow: hidden;
 }
+.element-invisible:focus {
+	width: auto;
+	height: auto;
+	overflow: auto;
+	background: #eee;
+	color: #000;
+	padding: 1em;
+}
 .form-vertical .control-label {
 	float: none;
 	width: auto;
diff --git a/administrator/templates/isis/index.php b/administrator/templates/isis/index.php
index 3ecee963a3932..e0f119b1a65a5 100644
--- a/administrator/templates/isis/index.php
+++ b/administrator/templates/isis/index.php
@@ -190,6 +190,9 @@ function colorIsLight($color)
 				</a>
 			<?php endif; ?>
 
+			<!-- skip to content -->
+			<a class="element-invisible" href="#skiptarget"><?php echo JText::_('TPL_ISIS_SKIP_TO_MAIN_CONTENT'); ?></a>
+
 			<a class="admin-logo <?php echo ($hidden ? 'disabled' : ''); ?>" <?php echo ($hidden ? '' : 'href="' . $this->baseurl . '/index.php"'); ?>><span class="icon-joomla"></span></a>
 
 			<a class="brand hidden-desktop hidden-tablet" href="<?php echo $mainPageUri; ?>" title="<?php echo JText::sprintf('TPL_ISIS_PREVIEW', $sitename); ?>" target="_blank"><?php echo JHtml::_('string.truncate', $sitename, 14, false, false); ?>
@@ -259,6 +262,8 @@ function colorIsLight($color)
 				<div id="container-collapse" class="container-collapse"></div>
 				<div class="row-fluid">
 					<div class="span12">
+						<!-- target for skip to content link -->
+						<a id="skiptarget" class="element-invisible"><?php echo JText::_('TPL_ISIS_SKIP_TO_MAIN_CONTENT_HERE'); ?></a>
 						<jdoc:include type="modules" name="toolbar" style="no" />
 					</div>
 				</div>
@@ -266,7 +271,10 @@ function colorIsLight($color)
 		</div>
 	</div>
 <?php else : ?>
-	<div style="margin-bottom: 20px"></div>
+	<div style="margin-bottom: 20px">
+		<!-- target for skip to content link -->
+		<a id="skiptarget" class="element-invisible"><?php echo JText::_('TPL_ISIS_SKIP_TO_MAIN_CONTENT_HERE'); ?><</a>
+	</div>
 <?php endif; ?>
 <!-- container-fluid -->
 <div class="container-fluid container-main">
diff --git a/administrator/templates/isis/language/en-GB/en-GB.tpl_isis.ini b/administrator/templates/isis/language/en-GB/en-GB.tpl_isis.ini
index 29cfccfd8caa3..4bab04db0e632 100644
--- a/administrator/templates/isis/language/en-GB/en-GB.tpl_isis.ini
+++ b/administrator/templates/isis/language/en-GB/en-GB.tpl_isis.ini
@@ -28,6 +28,8 @@ TPL_ISIS_LOGO_DESC="Upload a custom logo for the administrator template."
 TPL_ISIS_LOGO_LABEL="Logo"
 TPL_ISIS_LOGOUT="Logout"
 TPL_ISIS_PREVIEW="Preview %s"
+TPL_ISIS_SKIP_TO_MAIN_CONTENT="Skip to Main Content"
+TPL_ISIS_SKIP_TO_MAIN_CONTENT_HERE="Main content begins here"
 TPL_ISIS_STATUS_BOTTOM="Fixed bottom"
 TPL_ISIS_STATUS_DESC="Choose the location of the status module."
 TPL_ISIS_STATUS_LABEL="Status Module Position"
diff --git a/media/jui/css/bootstrap-extended.css b/media/jui/css/bootstrap-extended.css
index 0dc2069697e69..3e422e04e68c1 100644
--- a/media/jui/css/bootstrap-extended.css
+++ b/media/jui/css/bootstrap-extended.css
@@ -397,6 +397,14 @@ fieldset.radio.btn-group {
 	width: 1px;
 	overflow: hidden;
 }
+.element-invisible:focus {
+	width: auto;
+	height: auto;
+	overflow: auto;
+	background: #eee;
+	color: #000;
+	padding: 1em;
+}
 .form-vertical .control-label {
 	float: none;
 	width: auto;
diff --git a/media/jui/less/bootstrap-extended.less b/media/jui/less/bootstrap-extended.less
index bded9a76d34f2..518e7cb5f1668 100644
--- a/media/jui/less/bootstrap-extended.less
+++ b/media/jui/less/bootstrap-extended.less
@@ -431,6 +431,16 @@ fieldset.radio.btn-group {
 	overflow: hidden;
 }
 
+/* Make Accessible Hidden Elements visible on focus */
+.element-invisible:focus {
+	width:auto;
+	height:auto;
+	overflow:auto;
+	background:#eee;
+	color:#000;
+	padding:1em;
+}
+
 /* Form Vertical Overrides Form Horizontal */
 .form-vertical {
 	.control-label {
diff --git a/templates/protostar/css/template.css b/templates/protostar/css/template.css
index 80e226fa72cde..c22cf35c1e99f 100644
--- a/templates/protostar/css/template.css
+++ b/templates/protostar/css/template.css
@@ -6126,6 +6126,14 @@ fieldset.radio.btn-group {
 	width: 1px;
 	overflow: hidden;
 }
+.element-invisible:focus {
+	width: auto;
+	height: auto;
+	overflow: auto;
+	background: #eee;
+	color: #000;
+	padding: 1em;
+}
 .form-vertical .control-label {
 	float: none;
 	width: auto;

From f1848d535333d109ce71e44dfc6164477b14bf03 Mon Sep 17 00:00:00 2001
From: Michael Babker <mbabker@flbab.com>
Date: Sun, 21 Aug 2016 11:12:54 -0500
Subject: [PATCH 11/13] Always set all columns from app's checkSession method
 (#11691)

---
 libraries/cms/application/cms.php | 46 +++++++++++++++++--------------
 1 file changed, 25 insertions(+), 21 deletions(-)

diff --git a/libraries/cms/application/cms.php b/libraries/cms/application/cms.php
index 44a43a68b53d7..180feb84aeb9c 100644
--- a/libraries/cms/application/cms.php
+++ b/libraries/cms/application/cms.php
@@ -180,27 +180,31 @@ public function checkSession()
 		{
 			$query->clear();
 
-			if ($session->isNew())
-			{
-				$query->insert($db->quoteName('#__session'))
-					->columns($db->quoteName('session_id') . ', ' . $db->quoteName('client_id') . ', ' . $db->quoteName('time'))
-					->values($db->quote($session->getId()) . ', ' . (int) $this->getClientId() . ', ' . $db->quote((int) time()));
-				$db->setQuery($query);
-			}
-			else
-			{
-				$query->insert($db->quoteName('#__session'))
-					->columns(
-						$db->quoteName('session_id') . ', ' . $db->quoteName('client_id') . ', ' . $db->quoteName('guest') . ', ' .
-						$db->quoteName('time') . ', ' . $db->quoteName('userid') . ', ' . $db->quoteName('username')
-					)
-					->values(
-						$db->quote($session->getId()) . ', ' . (int) $this->getClientId() . ', ' . (int) $user->get('guest') . ', ' .
-						$db->quote((int) $session->get('session.timer.start')) . ', ' . (int) $user->get('id') . ', ' . $db->quote($user->get('username'))
-					);
-
-				$db->setQuery($query);
-			}
+			$time = $session->isNew() ? time() : $session->get('session.timer.start');
+
+			$columns = array(
+				$db->quoteName('session_id'),
+				$db->quoteName('client_id'),
+				$db->quoteName('guest'),
+				$db->quoteName('time'),
+				$db->quoteName('userid'),
+				$db->quoteName('username'),
+			);
+
+			$values = array(
+				$db->quote($session->getId()),
+				(int) $this->getClientId(),
+				(int) $user->guest,
+				$db->quote((int) $time),
+				(int) $user->id,
+				$db->quote($user->username),
+			);
+
+			$query->insert($db->quoteName('#__session'))
+				->columns($columns)
+				->values(implode(', ', $values));
+
+			$db->setQuery($query);
 
 			// If the insert failed, exit the application.
 			try

From bc393904f4d224e15097fca3c3b13dc3b5231a28 Mon Sep 17 00:00:00 2001
From: Markus Wortmann <Worti2@users.noreply.github.com>
Date: Sun, 21 Aug 2016 18:34:01 +0200
Subject: [PATCH 12/13] A11Y blog categories article count (#11706)

---
 components/com_content/views/categories/tmpl/default_items.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/components/com_content/views/categories/tmpl/default_items.php b/components/com_content/views/categories/tmpl/default_items.php
index 216178790834a..d524c4c5fdff3 100644
--- a/components/com_content/views/categories/tmpl/default_items.php
+++ b/components/com_content/views/categories/tmpl/default_items.php
@@ -31,6 +31,7 @@
 				<?php echo $this->escape($item->title); ?></a>
 				<?php if ($this->params->get('show_cat_num_articles_cat') == 1) :?>
 					<span class="badge badge-info tip hasTooltip" title="<?php echo JHtml::tooltipText('COM_CONTENT_NUM_ITEMS_TIP'); ?>">
+						<?php echo JText::_('COM_CONTENT_NUM_ITEMS'); ?>&nbsp;
 						<?php echo $item->numitems; ?>
 					</span>
 				<?php endif; ?>

From e80e319f93d764a304f487b33ffc2edd63d17623 Mon Sep 17 00:00:00 2001
From: Lodder <lodder15@hotmail.co.uk>
Date: Sun, 21 Aug 2016 17:34:41 +0100
Subject: [PATCH 13/13] Fix offline image selector position for Hathor (#11534)

* Fix offline image selector position for Hathor

* Fix more instances of image selector
---
 administrator/templates/hathor/css/template.css   | 15 +++++++++++++++
 .../templates/hathor/css/template_rtl.css         | 15 +++++++++++++++
 administrator/templates/hathor/less/template.less | 15 +++++++++++++++
 3 files changed, 45 insertions(+)

diff --git a/administrator/templates/hathor/css/template.css b/administrator/templates/hathor/css/template.css
index 1b2f627ae1138..5ecc405383316 100644
--- a/administrator/templates/hathor/css/template.css
+++ b/administrator/templates/hathor/css/template.css
@@ -1915,6 +1915,21 @@ fieldset.adminform-legacy span.faux-label {
 	min-width: 150px;
 	float: left;
 }
+fieldset.adminform .input-prepend,
+fieldset.adminform .input-append,
+fieldset.panelform .input-prepend,
+fieldset.panelform .input-append {
+	float: left;
+}
+fieldset.adminform .adminformlist .btn.modal,
+fieldset.adminform .input-prepend > *,
+fieldset.adminform .input-append > *,
+fieldset.panelform .adminformlist .btn.modal,
+fieldset.panelform .input-prepend > *,
+fieldset.panelform .input-append > * {
+	float: none;
+	vertical-align: middle;
+}
 fieldset.panelform-legacy label.radiobtn-jno,
 fieldset.panelform-legacy label.radiobtn-jyes,
 fieldset.panelform-legacy label.radiobtn-show,
diff --git a/administrator/templates/hathor/css/template_rtl.css b/administrator/templates/hathor/css/template_rtl.css
index a0972b17b46ee..0f379de028ea0 100644
--- a/administrator/templates/hathor/css/template_rtl.css
+++ b/administrator/templates/hathor/css/template_rtl.css
@@ -494,6 +494,21 @@ table.paramlist td.paramlist_description {
 fieldset.adminform {
 	margin: 0 10px 10px 10px;
 }
+fieldset.adminform .input-prepend,
+fieldset.adminform .input-append,
+fieldset.panelform .input-prepend,
+fieldset.panelform .input-append {
+	float: right;
+}
+fieldset.adminform .adminformlist .btn.modal,
+fieldset.adminform .input-prepend > *,
+fieldset.adminform .input-append > *,
+fieldset.panelform .adminformlist .btn.modal,
+fieldset.panelform .input-prepend > *,
+fieldset.panelform .input-append > * {
+	float: none;
+	vertical-align: middle;
+}
 
 	/* Table styles are for use with tabular data */
 table.adminform {
diff --git a/administrator/templates/hathor/less/template.less b/administrator/templates/hathor/less/template.less
index 2e2e0e489ccea..5c3b4858c0d74 100644
--- a/administrator/templates/hathor/less/template.less
+++ b/administrator/templates/hathor/less/template.less
@@ -1068,6 +1068,21 @@ fieldset.adminform-legacy span.faux-label {
 
 }
 
+
+fieldset.adminform,
+fieldset.panelform {
+	.input-prepend,
+	.input-append {
+		float: left;
+	}
+	.adminformlist .btn.modal,
+	.input-prepend > *,
+	.input-append > * {
+		float: none;
+		vertical-align: middle;
+	}
+}
+
 /* JParameter classes on radio button labels */
 fieldset.panelform-legacy label.radiobtn-jno,
 fieldset.panelform-legacy label.radiobtn-jyes,