From 723e13a1f55a59bad24b9f4f959b938844c278fd Mon Sep 17 00:00:00 2001
From: infograf768 <infografjms@gmail.com>
Date: Tue, 6 Dec 2016 12:30:28 +0100
Subject: [PATCH 01/39] RTL: correcting image popup display (#13049)

---
 .../views/imageslist/tmpl/default.php         | 35 ++++++++++++++-----
 1 file changed, 26 insertions(+), 9 deletions(-)

diff --git a/administrator/components/com_media/views/imageslist/tmpl/default.php b/administrator/components/com_media/views/imageslist/tmpl/default.php
index 9b850963bdfe0..dbfc99d6c5651 100644
--- a/administrator/components/com_media/views/imageslist/tmpl/default.php
+++ b/administrator/components/com_media/views/imageslist/tmpl/default.php
@@ -19,16 +19,33 @@
 }
 
 JFactory::getDocument()->addScriptDeclaration("var ImageManager = window.parent.ImageManager;");
-JFactory::getDocument()->addStyleDeclaration(
-	"
-		@media (max-width: 767px) {
-			li.imgOutline.thumbnail.height-80.width-80.center {
-				float: left;
-				margin-left: 15px;
+
+if ($lang->isRtl())
+{
+	JFactory::getDocument()->addStyleDeclaration(
+		"
+			@media (max-width: 767px) {
+				li.imgOutline.thumbnail.height-80.width-80.center {
+					float: right;
+					margin-right: 15px;
+				}
 			}
-		}
-	"
-);
+		"
+	);
+}
+else
+{
+	JFactory::getDocument()->addStyleDeclaration(
+		"
+			@media (max-width: 767px) {
+				li.imgOutline.thumbnail.height-80.width-80.center {
+					float: left;
+					margin-left: 15px;
+				}
+			}
+		"
+	);
+}
 ?>
 <?php if (count($this->images) > 0 || count($this->folders) > 0) : ?>
 	<ul class="manager thumbnails">

From 6d4b2a7c81c54035b5d03bc4c8caa90822593177 Mon Sep 17 00:00:00 2001
From: Niels van der Veer <n.i.vdveer@gmail.com>
Date: Tue, 6 Dec 2016 22:46:08 +0100
Subject: [PATCH 02/39] [com_content] Filter on publish_up and publish_down
 (#11670)

* Filter on publish_up and publish_down

* Place the filter after the created filter

* Change date column when apply the filter

* Change heading when publish filter is applied

* Add language string

* Fix syntax error

* fixes for publish/unpublish

added language strings. now shows '-' instead of invalid date when no publish date. show correct header

* changed language string

start published -> start publishing

* Do it in simpler way

IMHO this should not be that complicated. Do it simpler.

* Small fix

* Declare the $orderingColumn at the top

* Hathor now also uses 'date created'

* added same functionality to featured articles view

* Update filter_featured.xml and template hathor featured/default.php

* moved/reorderd new strings
---
 .../models/forms/filter_articles.xml          |  4 ++++
 .../models/forms/filter_featured.xml          |  4 ++++
 .../views/articles/tmpl/default.php           | 20 ++++++++++++++++--
 .../views/featured/tmpl/default.php           | 21 ++++++++++++++++---
 .../language/en-GB/en-GB.com_content.ini      |  7 +++++++
 .../html/com_content/articles/default.php     |  2 +-
 .../html/com_content/featured/default.php     |  2 +-
 7 files changed, 53 insertions(+), 7 deletions(-)

diff --git a/administrator/components/com_content/models/forms/filter_articles.xml b/administrator/components/com_content/models/forms/filter_articles.xml
index f8afdfe735446..3ac0fcdbbdcc8 100644
--- a/administrator/components/com_content/models/forms/filter_articles.xml
+++ b/administrator/components/com_content/models/forms/filter_articles.xml
@@ -110,6 +110,10 @@
 			<option value="language DESC">JGRID_HEADING_LANGUAGE_DESC</option>
 			<option value="a.created ASC">JDATE_ASC</option>
 			<option value="a.created DESC">JDATE_DESC</option>
+			<option value="a.publish_up ASC">COM_CONTENT_PUBLISH_UP_ASC</option>
+			<option value="a.publish_up DESC">COM_CONTENT_PUBLISH_UP_DESC</option>
+			<option value="a.publish_down ASC">COM_CONTENT_PUBLISH_DOWN_ASC</option>
+			<option value="a.publish_down DESC">COM_CONTENT_PUBLISH_DOWN_DESC</option>
 			<option value="a.hits ASC">JGLOBAL_HITS_ASC</option>
 			<option value="a.hits DESC">JGLOBAL_HITS_DESC</option>
 			<option value="rating_count ASC" requires="vote">JGLOBAL_VOTES_ASC</option>
diff --git a/administrator/components/com_content/models/forms/filter_featured.xml b/administrator/components/com_content/models/forms/filter_featured.xml
index f47211bb809ea..2f7f1a9621a33 100644
--- a/administrator/components/com_content/models/forms/filter_featured.xml
+++ b/administrator/components/com_content/models/forms/filter_featured.xml
@@ -101,6 +101,10 @@
 			<option value="a.access DESC">JGRID_HEADING_ACCESS_DESC</option>
 			<option value="a.created_by ASC">JAUTHOR_ASC</option>
 			<option value="a.created_by DESC">JAUTHOR_DESC</option>
+			<option value="a.publish_up ASC">COM_CONTENT_PUBLISH_UP_ASC</option>
+			<option value="a.publish_up DESC">COM_CONTENT_PUBLISH_UP_DESC</option>
+			<option value="a.publish_down ASC">COM_CONTENT_PUBLISH_DOWN_ASC</option>
+			<option value="a.publish_down DESC">COM_CONTENT_PUBLISH_DOWN_DESC</option>
 			<option value="language ASC">JGRID_HEADING_LANGUAGE_ASC</option>
 			<option value="language DESC">JGRID_HEADING_LANGUAGE_DESC</option>
 			<option value="a.created ASC">JDATE_ASC</option>
diff --git a/administrator/components/com_content/views/articles/tmpl/default.php b/administrator/components/com_content/views/articles/tmpl/default.php
index 93ff90241bf7a..32b2191596460 100644
--- a/administrator/components/com_content/views/articles/tmpl/default.php
+++ b/administrator/components/com_content/views/articles/tmpl/default.php
@@ -23,6 +23,19 @@
 $saveOrder = $listOrder == 'a.ordering';
 $columns   = 10;
 
+if (strpos($listOrder, 'publish_up') !== false)
+{
+	$orderingColumn = 'publish_up';
+}
+elseif (strpos($listOrder, 'publish_down') !== false)
+{
+	$orderingColumn = 'publish_down';
+}
+else
+{
+	$orderingColumn = 'created';
+}
+
 if ($saveOrder)
 {
 	$saveOrderingUrl = 'index.php?option=com_content&task=articles.saveOrderAjax&tmpl=component';
@@ -81,7 +94,7 @@
 							<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_LANGUAGE', 'language', $listDirn, $listOrder); ?>
 						</th>
 						<th width="10%" class="nowrap hidden-phone">
-							<?php echo JHtml::_('searchtools.sort', 'JDATE', 'a.created', $listDirn, $listOrder); ?>
+							<?php echo JHtml::_('searchtools.sort', 'COM_CONTENT_HEADING_DATE_' . strtoupper($orderingColumn), 'a.' . $orderingColumn, $listDirn, $listOrder); ?>
 						</th>
 						<th width="1%" class="nowrap hidden-phone">
 							<?php echo JHtml::_('searchtools.sort', 'JGLOBAL_HITS', 'a.hits', $listDirn, $listOrder); ?>
@@ -202,7 +215,10 @@
 							<?php echo JLayoutHelper::render('joomla.content.language', $item); ?>
 						</td>
 						<td class="nowrap small hidden-phone">
-							<?php echo JHtml::_('date', $item->created, JText::_('DATE_FORMAT_LC4')); ?>
+							<?php
+							$date = $item->{$orderingColumn};
+							echo $date > 0 ? JHtml::_('date', $date, JText::_('DATE_FORMAT_LC4')) : '-';
+							?>
 						</td>
 						<td class="hidden-phone center">
 							<span class="badge badge-info">
diff --git a/administrator/components/com_content/views/featured/tmpl/default.php b/administrator/components/com_content/views/featured/tmpl/default.php
index 198844f1a5a8b..8dffb74376bc6 100644
--- a/administrator/components/com_content/views/featured/tmpl/default.php
+++ b/administrator/components/com_content/views/featured/tmpl/default.php
@@ -23,6 +23,19 @@
 $saveOrder = $listOrder == 'fp.ordering';
 $columns   = 10;
 
+if (strpos($listOrder, 'publish_up') !== false)
+{
+	$orderingColumn = 'publish_up';
+}
+elseif (strpos($listOrder, 'publish_down') !== false)
+{
+	$orderingColumn = 'publish_down';
+}
+else
+{
+	$orderingColumn = 'created';
+}
+
 if ($saveOrder)
 {
 	$saveOrderingUrl = 'index.php?option=com_content&task=featured.saveOrderAjax&tmpl=component';
@@ -73,7 +86,7 @@
 							<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_LANGUAGE', 'language', $listDirn, $listOrder); ?>
 						</th>
 						<th width="10%" class="nowrap hidden-phone">
-							<?php echo JHtml::_('searchtools.sort', 'JDATE', 'a.created', $listDirn, $listOrder); ?>
+							<?php echo JHtml::_('searchtools.sort', 'COM_CONTENT_HEADING_DATE_' . strtoupper($orderingColumn), 'a.' . $orderingColumn, $listDirn, $listOrder); ?>
 						</th>
 						<th width="1%" class="nowrap hidden-phone">
 							<?php echo JHtml::_('searchtools.sort', 'JGLOBAL_HITS', 'a.hits', $listDirn, $listOrder); ?>
@@ -188,8 +201,10 @@
 								<?php echo JLayoutHelper::render('joomla.content.language', $item); ?>
 							</td>
 							<td class="nowrap small hidden-phone">
-								<?php echo JHtml::_('date', $item->created, JText::_('DATE_FORMAT_LC4')); ?>
-							</td>
+								<?php
+								$date = $item->{$orderingColumn};
+								echo $date > 0 ? JHtml::_('date', $date, JText::_('DATE_FORMAT_LC4')) : '-';
+								?>							</td>
 							<td class="center hidden-phone">
 								<span class="badge badge-info">
 								<?php echo (int) $item->hits; ?>
diff --git a/administrator/language/en-GB/en-GB.com_content.ini b/administrator/language/en-GB/en-GB.com_content.ini
index 86296617eabda..bca7ff108b87d 100644
--- a/administrator/language/en-GB/en-GB.com_content.ini
+++ b/administrator/language/en-GB/en-GB.com_content.ini
@@ -119,6 +119,9 @@ COM_CONTENT_FLOAT_FULLTEXT_LABEL="Full Text Image Float"
 COM_CONTENT_FLOAT_LABEL="Image Float"
 COM_CONTENT_FLOAT_INTRO_LABEL="Intro Image Float"
 COM_CONTENT_HEADING_ASSOCIATION="Association"
+COM_CONTENT_HEADING_DATE_CREATED="Date Created"
+COM_CONTENT_HEADING_DATE_PUBLISH_UP="Start Publishing"
+COM_CONTENT_HEADING_DATE_PUBLISH_DOWN="Finish Publishing"
 COM_CONTENT_ID_LABEL="ID"
 COM_CONTENT_ITEM_ASSOCIATIONS_FIELDSET_LABEL="Content Item Associations"
 COM_CONTENT_ITEM_ASSOCIATIONS_FIELDSET_DESC="Multilingual only! This choice will only display if the Language Filter parameter 'Item Associations' is set to 'Yes'. Choose a content item for the target language. This association will let the Language Switcher module redirect to the associated content item in another language. If used, make sure to display the Language switcher module on the concerned pages. A content item set to language 'All' can't be associated."
@@ -155,6 +158,10 @@ COM_CONTENT_PAGEBREAK_DOC_TITLE="Page Break"
 COM_CONTENT_PAGEBREAK_INSERT_BUTTON="Insert Page Break"
 COM_CONTENT_PAGEBREAK_TITLE="Page Title:"
 COM_CONTENT_PAGEBREAK_TOC="Table of Contents Alias:"
+COM_CONTENT_PUBLISH_DOWN_ASC="Finish Publishing ascending"
+COM_CONTENT_PUBLISH_DOWN_DESC="Finish Publishing descending"
+COM_CONTENT_PUBLISH_UP_ASC="Start Publishing ascending"
+COM_CONTENT_PUBLISH_UP_DESC="Start Publishing descending"
 COM_CONTENT_RIGHT="Right"
 COM_CONTENT_SAVE_SUCCESS="Article successfully saved."
 COM_CONTENT_SAVE_WARNING="Alias already existed so a number was added at the end. You can re-edit the article to customise the alias."
diff --git a/administrator/templates/hathor/html/com_content/articles/default.php b/administrator/templates/hathor/html/com_content/articles/default.php
index 40cfe911a2513..73256d33aa3b0 100644
--- a/administrator/templates/hathor/html/com_content/articles/default.php
+++ b/administrator/templates/hathor/html/com_content/articles/default.php
@@ -126,7 +126,7 @@
 					<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_CREATED_BY', 'a.created_by', $listDirn, $listOrder); ?>
 				</th>
 				<th class="title date-col">
-					<?php echo JHtml::_('grid.sort', 'JDATE', 'a.created', $listDirn, $listOrder); ?>
+					<?php echo JHtml::_('grid.sort', 'COM_CONTENT_HEADING_DATE_CREATED', 'a.created', $listDirn, $listOrder); ?>
 				</th>
 				<th class="hits-col">
 					<?php echo JHtml::_('grid.sort', 'JGLOBAL_HITS', 'a.hits', $listDirn, $listOrder); ?>
diff --git a/administrator/templates/hathor/html/com_content/featured/default.php b/administrator/templates/hathor/html/com_content/featured/default.php
index f7a752f8d7c43..dc7420642d252 100644
--- a/administrator/templates/hathor/html/com_content/featured/default.php
+++ b/administrator/templates/hathor/html/com_content/featured/default.php
@@ -105,7 +105,7 @@
 					<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_CREATED_BY', 'a.created_by', $listDirn, $listOrder); ?>
 				</th>
 				<th class="title date-col">
-					<?php echo JHtml::_('grid.sort', 'JDATE', 'a.created', $listDirn, $listOrder); ?>
+					<?php echo JHtml::_('grid.sort', 'COM_CONTENT_HEADING_DATE_CREATED', 'a.created', $listDirn, $listOrder); ?>
 				</th>
 				<th class="hits-col">
 					<?php echo JHtml::_('grid.sort', 'JGLOBAL_HITS', 'a.hits', $listDirn, $listOrder); ?>

From cd33086a7a6322a2d5bf0b963d80a6daf38a055f Mon Sep 17 00:00:00 2001
From: Fedir Zinchuk <getthesite@gmail.com>
Date: Tue, 6 Dec 2016 23:48:05 +0200
Subject: [PATCH 03/39] TinyMCE drag&drop toolbar editing (#11926)

* tinymce initialization, use addScriptOptions and tinymce-init.js

* Finalize tinymce-init.js

* Small improve for code duplication

* Allow multiple editors with diferent options

* Setup default options for the editor script only once

* Minified version of tinymce-init

* code style

* Improve a bit

* add TinymceBuilder

* base markup for drag-drop

* drag in / drag out

* tinymce-config leveloptions form

*  tinymce-builder.js

* Render buttons with javascript

* Allow to set values from the preset, and make extra options form work

* Clear the forms

* clearPane

* Enable tooltip for buttons

* Move buttons and presets list to PlgEditorTinymce class

* Get options depend from user ViewLevel

* Make it work

* Make text inputs usable

* c.s. a bit

* Use Sets

* highlight the drop area

* TinyMCE buttons translation

* Add color to preset butons

* Some more highlight for the drop area

* Update the presets to be more close to what we have now, for B/C

* Do not ignore a group separator, update advanced preset and fix resizing

* Update the field label

* Update call of JHtml for a 'script' and 'stylesheet'
---
 .../en-GB/en-GB.plg_editors_tinymce.ini       |  61 ++
 .../editors/tinymce/field/tinymcebuilder.php  | 198 +++++
 .../field/tinymcebuilder/setoptions.php       |  26 +
 media/editors/tinymce/js/tinymce-builder.js   | 270 +++++++
 .../editors/tinymce/field/tinymcebuilder.php  | 117 +++
 plugins/editors/tinymce/form/setoptions.xml   | 310 ++++++++
 plugins/editors/tinymce/tinymce.php           | 692 ++++++++----------
 plugins/editors/tinymce/tinymce.xml           | 534 +-------------
 8 files changed, 1282 insertions(+), 926 deletions(-)
 create mode 100644 layouts/plugins/editors/tinymce/field/tinymcebuilder.php
 create mode 100644 layouts/plugins/editors/tinymce/field/tinymcebuilder/setoptions.php
 create mode 100644 media/editors/tinymce/js/tinymce-builder.js
 create mode 100644 plugins/editors/tinymce/field/tinymcebuilder.php
 create mode 100644 plugins/editors/tinymce/form/setoptions.xml

diff --git a/administrator/language/en-GB/en-GB.plg_editors_tinymce.ini b/administrator/language/en-GB/en-GB.plg_editors_tinymce.ini
index 71ab2a85d282d..c68417038437b 100644
--- a/administrator/language/en-GB/en-GB.plg_editors_tinymce.ini
+++ b/administrator/language/en-GB/en-GB.plg_editors_tinymce.ini
@@ -74,6 +74,8 @@ PLG_TINY_FIELD_NEWLINES_DESC="New lines will be created using the selected optio
 PLG_TINY_FIELD_NEWLINES_LABEL="New Lines"
 PLG_TINY_FIELD_NONBREAKING_DESC="Insert non-breaking space entities."
 PLG_TINY_FIELD_NONBREAKING_LABEL="Non-breaking"
+PLG_TINY_FIELD_NUMBER_OF_SETS_LABEL="Number of Sets"
+PLG_TINY_FIELD_NUMBER_OF_SETS_DESC="Number of sets that can be created. Minimum 3"
 PLG_TINY_FIELD_PASTE_DESC="Show or hide the Paste button."
 PLG_TINY_FIELD_PASTE_LABEL="Paste"
 PLG_TINY_FIELD_PATH_DESC="If set to ON, it displays the set classes for the marked text."
@@ -135,8 +137,67 @@ PLG_TINY_FIELD_VISUALCHARS_DESC="See invisible characters, specifically non-brea
 PLG_TINY_FIELD_VISUALCHARS_LABEL="Visualchars"
 PLG_TINY_FIELD_WORDCOUNT_DESC="Turn on/off Wordcount."
 PLG_TINY_FIELD_WORDCOUNT_LABEL="Wordcount"
+PLG_TINY_SET_TITLE="Set %s"
+PLG_TINY_SET_PRESET_BUTTON_ADVANCED="Use advanced preset"
+PLG_TINY_SET_PRESET_BUTTON_MEDIUM="Use medium preset"
+PLG_TINY_SET_PRESET_BUTTON_SIMPLE="Use simple preset"
 PLG_TINY_TEMPLATE_LAYOUT1_DESC="HTML layout."
 PLG_TINY_TEMPLATE_LAYOUT1_TITLE="Layout"
 PLG_TINY_TEMPLATE_SNIPPET1_DESC="Simple HTML snippet."
 PLG_TINY_TEMPLATE_SNIPPET1_TITLE="Simple Snippet"
 PLG_TINY_XML_DESCRIPTION="TinyMCE is a platform independent web based JavaScript HTML WYSIWYG Editor."
+
+; TinyMCE toolbar buttons
+PLG_TINY_TOOLBAR_BUTTON_ALIGNCENTER="Align center"
+PLG_TINY_TOOLBAR_BUTTON_ALIGNJUSTIFY="Justify"
+PLG_TINY_TOOLBAR_BUTTON_ALIGNLEFT="Align left"
+PLG_TINY_TOOLBAR_BUTTON_ALIGNRIGHT="Align right"
+PLG_TINY_TOOLBAR_BUTTON_ANCHOR="Anchor"
+PLG_TINY_TOOLBAR_BUTTON_BACKCOLOR="Background color"
+PLG_TINY_TOOLBAR_BUTTON_BLOCKQUOTE="Blockquote"
+PLG_TINY_TOOLBAR_BUTTON_BOLD="Bold"
+PLG_TINY_TOOLBAR_BUTTON_BULLIST="Bulleted list"
+PLG_TINY_TOOLBAR_BUTTON_CHARMAP="Special character"
+PLG_TINY_TOOLBAR_BUTTON_CODE="Source code"
+PLG_TINY_TOOLBAR_BUTTON_CODESAMPLE="Codesample"
+PLG_TINY_TOOLBAR_BUTTON_COPY="Copy"
+PLG_TINY_TOOLBAR_BUTTON_CUT="Cut"
+PLG_TINY_TOOLBAR_BUTTON_EMOTICONS="Emoticons"
+PLG_TINY_TOOLBAR_BUTTON_FONTSELECT="Font Select"
+PLG_TINY_TOOLBAR_BUTTON_FONTSIZESELECT="Fontsize Select"
+PLG_TINY_TOOLBAR_BUTTON_FORECOLOR="Text color"
+PLG_TINY_TOOLBAR_BUTTON_FORMATSELECT="Format select"
+PLG_TINY_TOOLBAR_BUTTON_FULLSCREEN="Fullscreen"
+PLG_TINY_TOOLBAR_BUTTON_HR="Horizontal line"
+PLG_TINY_TOOLBAR_BUTTON_IMAGE="Insert/edit image"
+PLG_TINY_TOOLBAR_BUTTON_INDENT="Increase indent"
+PLG_TINY_TOOLBAR_BUTTON_INSERTDATETIME="Insert date/time"
+PLG_TINY_TOOLBAR_BUTTON_ITALIC="Italic"
+PLG_TINY_TOOLBAR_BUTTON_LINK="Insert/edit link"
+PLG_TINY_TOOLBAR_BUTTON_LTR="Left to right"
+PLG_TINY_TOOLBAR_BUTTON_MEDIA="Insert/edit video"
+PLG_TINY_TOOLBAR_BUTTON_NONBREAKING="Nonbreaking space"
+PLG_TINY_TOOLBAR_BUTTON_NUMLIST="Numbered list"
+PLG_TINY_TOOLBAR_BUTTON_OUTDENT="Decrease indent"
+PLG_TINY_TOOLBAR_BUTTON_PAGEBREAK="Page break"
+PLG_TINY_TOOLBAR_BUTTON_PASTE="Paste"
+PLG_TINY_TOOLBAR_BUTTON_PASTETEXT="Paste as text"
+PLG_TINY_TOOLBAR_BUTTON_PREVIEW="Preview"
+PLG_TINY_TOOLBAR_BUTTON_PRINT="Print"
+PLG_TINY_TOOLBAR_BUTTON_REDO="Redo"
+PLG_TINY_TOOLBAR_BUTTON_REMOVEFORMAT="Clear formatting"
+PLG_TINY_TOOLBAR_BUTTON_RTL="Right to left"
+PLG_TINY_TOOLBAR_BUTTON_SEARCHREPLACE="Find and replace"
+PLG_TINY_TOOLBAR_BUTTON_SPELLCHECKER="Spellcheck"
+PLG_TINY_TOOLBAR_BUTTON_STYLESELECT="Style Select"
+PLG_TINY_TOOLBAR_BUTTON_STRIKETHROUGH="Strikethrough"
+PLG_TINY_TOOLBAR_BUTTON_SUBSCRIPT="Subscript"
+PLG_TINY_TOOLBAR_BUTTON_SUPERSCRIPT="Superscript"
+PLG_TINY_TOOLBAR_BUTTON_TABLE="Table"
+PLG_TINY_TOOLBAR_BUTTON_TEMPLATE="Template"
+PLG_TINY_TOOLBAR_BUTTON_UNDERLINE="Underline"
+PLG_TINY_TOOLBAR_BUTTON_UNDO="Undo"
+PLG_TINY_TOOLBAR_BUTTON_UNLINK="Remove link"
+PLG_TINY_TOOLBAR_BUTTON_VISUALBLOCKS="Show blocks"
+PLG_TINY_TOOLBAR_BUTTON_VISUALCHARS="Show invisible characters"
+PLG_TINY_TOOLBAR_BUTTON_SEPARATOR="Separator"
diff --git a/layouts/plugins/editors/tinymce/field/tinymcebuilder.php b/layouts/plugins/editors/tinymce/field/tinymcebuilder.php
new file mode 100644
index 0000000000000..e7eb535e1aca9
--- /dev/null
+++ b/layouts/plugins/editors/tinymce/field/tinymcebuilder.php
@@ -0,0 +1,198 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Editors.tinymce
+ *
+ * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+extract($displayData);
+
+/**
+ * Layout variables
+ * -----------------
+ * @var   string  $autocomplete   Autocomplete attribute for the field.
+ * @var   boolean $autofocus      Is autofocus enabled?
+ * @var   string  $class          Classes for the input.
+ * @var   string  $description    Description of the field.
+ * @var   boolean $disabled       Is this field disabled?
+ * @var   string  $group          Group the field belongs to. <fields> section in form XML.
+ * @var   boolean $hidden         Is this field hidden in the form?
+ * @var   string  $hint           Placeholder for the field.
+ * @var   string  $id             DOM id of the field.
+ * @var   string  $label          Label of the field.
+ * @var   string  $labelclass     Classes to apply to the label.
+ * @var   boolean $multiple       Does this field support multiple values?
+ * @var   string  $name           Name of the input field.
+ * @var   string  $onchange       Onchange attribute for the field.
+ * @var   string  $onclick        Onclick attribute for the field.
+ * @var   string  $pattern        Pattern (Reg Ex) of value of the form field.
+ * @var   boolean $readonly       Is this field read only?
+ * @var   boolean $repeat         Allows extensions to duplicate elements.
+ * @var   boolean $required       Is this field required?
+ * @var   integer $size           Size attribute of the input.
+ * @var   boolean $spellcheck     Spellcheck state for the form field.
+ * @var   string  $validate       Validation rules to apply.
+ * @var   string  $value          Value attribute of the field.
+  *
+ * @var   array   $menus           List of the menu items
+ * @var   array   $menubarSource   Menu items for builder
+ * @var   array   $buttons         List of the buttons
+ * @var   array   $buttonsSource   Buttons by group, for the builder
+ * @var   array   $toolbarPreset   Toolbar presset (default values)
+ * @var   int     $setsAmount      Amount of sets
+ * @var   array   $setsNames       List of Sets names
+ * @var   JForm[] $setsForms       Form with extra options for an each set
+ *
+ * @var   JLayoutFile  $this       Context
+ */
+
+JHtml::_('behavior.core');
+JHtml::_('stylesheet', 'media/editors/tinymce/skins/lightgray/skin.min.css', array('version' => 'auto', 'relative' => false));
+JHtml::_('jquery.ui', array('core', 'sortable'));
+JHtml::_('script', 'editors/tinymce/tinymce-builder.js', array('version' => 'auto', 'relative' => true));
+
+$doc = JFactory::getDocument();
+$doc->addScriptOptions('plg_editors_tinymce_builder', array(
+		'menus'         => $menus,
+		'buttons'       => $buttons,
+		'toolbarPreset' => $toolbarPreset,
+		'formControl'   => $name . '[toolbars]',
+	)
+);
+$doc->addStyleDeclaration('
+    #joomla-tinymce-builder{
+		margin-left: -180px;
+	}
+	.mce-menubar,
+	.mce-panel {
+		min-height: 18px;
+		border-bottom: 1px solid rgba(217,217,217,0.52);
+		white-space: normal;
+	}
+	.mce-tinymce {
+		margin-bottom: 20px;
+	}
+	.mce-panel .drop-area-highlight{
+		background-color: #d0d0d0;
+	}
+	.mce-panel .mce-btn.ui-state-highlight{
+		height: 28px;
+		width: 40px;
+		background-color: #409740;
+		border: 1px solid #f0f0f0;
+	}
+	.timymce-builder-toolbar .mce-btn.ui-state-highlight{
+		height: 22px;
+		width: 28px;
+	}
+');
+
+?>
+<div id="joomla-tinymce-builder">
+	<div class="mce-tinymce mce-container mce-panel">
+		<div class="mce-container-body mce-stack-layout">
+
+			<div class="mce-container mce-menubar mce-toolbar mce-stack-layout-item">
+				<div class="mce-container-body mce-flow-layout timymce-builder-menu source" data-group="menu"
+					data-value="<?php echo $this->escape(json_encode($menubarSource)); ?>">
+				</div>
+			</div>
+
+			<div class="mce-toolbar-grp mce-container mce-panel mce-stack-layout-item">
+				<div class="mce-container-body mce-flow-layout timymce-builder-toolbar source" data-group="toolbar"
+					data-value="<?php echo $this->escape(json_encode($buttonsSource)); ?>">
+				</div>
+			</div>
+		</div>
+	</div>
+
+	<!-- Render tabs for each set -->
+	<ul class="nav nav-tabs" id="set-tabs">
+		<?php foreach ( $setsNames as $num => $title ): ?>
+		<li class="<?php echo $num === $setsAmount - 1 ? 'active' : '' ?>">
+			<a href="#set-<?php echo $num; ?>"><?php echo $title; ?></a>
+		</li>
+		<?php endforeach; ?>
+	</ul>
+
+	<!-- Render tab content for each set -->
+	<div class="tab-content">
+		<?php
+		$presetButtonClases = array(
+			'simple'   => 'btn-success',
+			'medium'   => 'btn-info',
+			'advanced' => 'btn-warning',
+		);
+		foreach ( $setsNames as $num => $title ):
+
+			// Check whether the values exists, and if empty then use from preset
+			if (empty($value['toolbars'][$num]['menu'])
+				&& empty($value['toolbars'][$num]['toolbar1'])
+				&& empty($value['toolbars'][$num]['toolbar2']))
+			{
+				// Take the preset for default value
+				switch ($num) {
+					case 0:
+						$preset = $toolbarPreset['advanced'];
+						break;
+					case 1:
+						$preset = $toolbarPreset['medium'];
+						break;
+					default:
+						$preset = $toolbarPreset['simple'];
+				}
+
+				$value['toolbars'][$num] = $preset;
+			}
+
+			// Take existing values
+			$valMenu = empty($value['toolbars'][$num]['menu'])     ? array() : $value['toolbars'][$num]['menu'];
+			$valBar1 = empty($value['toolbars'][$num]['toolbar1']) ? array() : $value['toolbars'][$num]['toolbar1'];
+			$valBar2 = empty($value['toolbars'][$num]['toolbar2']) ? array() : $value['toolbars'][$num]['toolbar2'];
+		?>
+			<div class="tab-pane <?php echo $num === $setsAmount - 1 ? 'active' : '' ?>" id="set-<?php echo $num; ?>">
+				<div class="btn-toolbar clearfix">
+					<div class="btn-group pull-right">
+
+					<?php foreach(array_keys($toolbarPreset) as $presetName):
+						$btnClass = empty($presetButtonClases[$presetName])	? 'btn-primary' : $presetButtonClases[$presetName];
+						?>
+						<button type="button" class="btn btn-mini <?php echo $btnClass; ?> button-action"
+						    data-action="setPreset" data-preset="<?php echo $presetName; ?>" data-set="<?php echo $num; ?>">
+							<?php echo JText::_('PLG_TINY_SET_PRESET_BUTTON_' . $presetName); ?>
+						</button>
+					<?php endforeach; ?>
+
+						<button type="button" class="btn btn-mini btn-danger button-action"
+						     data-action="clearPane" data-set="<?php echo $num; ?>">
+							<?php echo JText::_('JCLEAR'); ?></button>
+					</div>
+				</div>
+
+				<div class="mce-tinymce mce-container mce-panel">
+					<div class="mce-container-body mce-stack-layout">
+						<div class="mce-container mce-menubar mce-toolbar timymce-builder-menu target"
+							data-group="menu" data-set="<?php echo $num; ?>"
+							data-value="<?php echo $this->escape(json_encode($valMenu)); ?>">
+						</div>
+						<div class="mce-toolbar-grp mce-container mce-panel timymce-builder-toolbar target"
+						    data-group="toolbar1" data-set="<?php echo $num; ?>"
+						    data-value="<?php echo $this->escape(json_encode($valBar1)); ?>">
+						</div>
+						<div class="mce-toolbar-grp mce-container mce-panel timymce-builder-toolbar target"
+						    data-group="toolbar2" data-set="<?php echo $num; ?>"
+						    data-value="<?php echo $this->escape(json_encode($valBar2)); ?>">
+						</div>
+					</div>
+				</div>
+
+				<!-- Render the form for extra options -->
+				<?php echo $this->sublayout('setoptions', array('form' => $setsForms[$num])); ?>
+			</div>
+		<?php endforeach; ?>
+	</div>
+</div>
diff --git a/layouts/plugins/editors/tinymce/field/tinymcebuilder/setoptions.php b/layouts/plugins/editors/tinymce/field/tinymcebuilder/setoptions.php
new file mode 100644
index 0000000000000..cd0feb3c17acf
--- /dev/null
+++ b/layouts/plugins/editors/tinymce/field/tinymcebuilder/setoptions.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Editors.tinymce
+ *
+ * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+extract($displayData);
+
+/**
+ * Layout variables
+ * -----------------
+ * @var   JForm        $form    Form with extra options for the set
+ * @var   JLayoutFile  $this    Context
+ */
+
+?>
+<div class="setoptions-form-wrapper">
+<?php foreach ($form->getGroup(null) as $field):?>
+	<?php echo $field->renderField(); ?>
+<?php endforeach; ?>
+</div>
diff --git a/media/editors/tinymce/js/tinymce-builder.js b/media/editors/tinymce/js/tinymce-builder.js
new file mode 100644
index 0000000000000..b04da84fee3fb
--- /dev/null
+++ b/media/editors/tinymce/js/tinymce-builder.js
@@ -0,0 +1,270 @@
+/**
+ * @copyright  Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+;(function($) {
+    "use strict";
+
+    /**
+     * Joomla TinyMCE Builder
+     *
+     * @param {HTMLElement} container
+     * @param {Object}      options
+     * @constructor
+     *
+     * @since  __DEPLOY_VERSION__
+     */
+    var JoomlaTinyMCEBuilder = function(container, options) {
+        this.$container = $(container);
+        this.options    = options;
+
+        // Find source containers
+        this.$sourceMenu    = this.$container.find('.timymce-builder-menu.source');
+        this.$sourceToolbar = this.$container.find('.timymce-builder-toolbar.source');
+
+        // Find target containers
+        this.$targetMenu    = this.$container.find('.timymce-builder-menu.target');
+        this.$targetToolbar = this.$container.find('.timymce-builder-toolbar.target');
+
+        // Render Source elements
+        this.$sourceMenu.each(function(i, element){
+            this.renderBar(element, 'menu');
+        }.bind(this));
+        this.$sourceToolbar.each(function(i, element){
+            this.renderBar(element, 'toolbar');
+        }.bind(this));
+
+        // Render Target elements
+        this.$targetMenu.each(function(i, element){
+            this.renderBar(element, 'menu', null, true);
+        }.bind(this));
+        this.$targetToolbar.each(function(i, element){
+            this.renderBar(element, 'toolbar', null, true);
+        }.bind(this));
+
+        // Set up "drag&drop" stuff
+        var $copyHelper = null, removeIntent = false, self = this;
+        this.$sourceMenu.sortable({
+            connectWith: this.$targetMenu,
+            items: '.mce-btn',
+            cancel: '',
+            placeholder: 'mce-btn ui-state-highlight',
+            start: function(event, ui) {
+                self.$targetMenu.addClass('drop-area-highlight');
+            },
+            helper: function(event, el) {
+                $copyHelper = el.clone().insertAfter(el);
+                return el;
+            },
+            stop: function() {
+                $copyHelper && $copyHelper.remove();
+                self.$targetMenu.removeClass('drop-area-highlight');
+            }
+        });
+
+        this.$sourceToolbar.sortable({
+            connectWith: this.$targetToolbar,
+            items: '.mce-btn',
+            cancel: '',
+            placeholder: 'mce-btn ui-state-highlight',
+            start: function(event, ui) {
+                self.$targetToolbar.addClass('drop-area-highlight');
+            },
+            helper: function(event, el) {
+                $copyHelper = el.clone().insertAfter(el);
+                return el;
+            },
+            stop: function() {
+                $copyHelper && $copyHelper.remove();
+                self.$targetToolbar.removeClass('drop-area-highlight');
+            }
+        });
+
+        $().add(this.$targetMenu).add(this.$targetToolbar).sortable({
+            items: '.mce-btn',
+            cancel: '',
+            placeholder: 'mce-btn ui-state-highlight',
+            receive: function(event, ui) {
+                $copyHelper = null;
+                var $el = ui.item, $cont = $(this);
+                self.appendInput($el, $cont.data('group'), $cont.data('set'))
+            },
+            over: function (event, ui) {
+                removeIntent = false;
+            },
+            out: function (event, ui) {
+                removeIntent = true;
+            },
+            beforeStop: function (event, ui) {
+                if(removeIntent){
+                    ui.item.remove();
+                }
+            }
+        });
+
+        // Bind actions buttons
+        this.$container.on('click', '.button-action', function(event){
+            var $btn = $(event.target), action = $btn.data('action'), options = $btn.data();
+
+            if (this[action]) {
+                this[action].call(this, options);
+            } else {
+                throw new Error('Unsupported action ' + action);
+            }
+        }.bind(this));
+
+    };
+
+    /**
+     * Render the toolbar/menubar
+     *
+     * @param {HTMLElement} container  The toolbar container
+     * @param {String}      type       The type toolbar or menu
+     * @param {Array|null}  value      The value
+     * @param {Boolean}     withInput  Whether append input
+     *
+     * @since  __DEPLOY_VERSION__
+     */
+    JoomlaTinyMCEBuilder.prototype.renderBar = function(container, type, value, withInput) {
+        var $container = $(container),
+            group = $container.data('group'),
+            set = $container.data('set'),
+            items = type === 'menu' ? this.options.menus : this.options.buttons,
+            value = value ? value : ($container.data('value') || []),
+            item, name, $btn;
+
+        for ( var i = 0, l = value.length; i < l; i++ ) {
+            name = value[i];
+            item = items[name];
+
+            if (!item) {
+                continue;
+            }
+
+            $btn = this.createButton(name, item, type);
+            $container.append($btn);
+
+            // Enable tooltip
+            if ($btn.tooltip) {
+                $btn.tooltip({trigger: 'hover'});
+            }
+
+            // Add input
+            if (withInput) {
+                this.appendInput($btn, group, set);
+            }
+        }
+    };
+
+    /**
+     * Create the element needed for renderBar()
+     * @param {String} name
+     * @param {Object} info
+     * @param {String} type
+     *
+     * @return {jQuery}
+     *
+     * @since  __DEPLOY_VERSION__
+     */
+    JoomlaTinyMCEBuilder.prototype.createButton = function(name, info, type){
+        var $element = $('<div />', {
+            'class': 'mce-btn',
+            'data-name': name,
+            'data-toggle': 'tooltip',
+            'title': info.label
+        });
+        var $btn = $('<button/>', {
+            'type': 'button'
+        });
+        $element.append($btn);
+
+        if (type === 'menu') {
+            $btn.html('<span class="mce-txt">' + info.label + '</span> <i class="mce-caret"></i>');
+        } else {
+            $element.addClass('mce-btn-small');
+            $btn.html(info.text ? info.text : '<span class="mce-ico mce-i-' + name + '"></span>');
+        }
+
+        return $element;
+    };
+
+    /**
+     * Append input to the button item
+     * @param {HTMLElement} element
+     * @param {String}      group
+     * @param {String}      set
+     *
+     * @since  __DEPLOY_VERSION__
+     */
+    JoomlaTinyMCEBuilder.prototype.appendInput = function (element, group, set) {
+        var $el    = $(element),
+            name   = this.options.formControl + '[' + set + '][' + group + '][]',
+            $input = $('<input/>', {
+                type: 'hidden',
+                name:  name,
+                value: $el.data('name')
+            });
+
+        $el.append($input);
+    };
+
+    /**
+     * Set Selected preset to specific  set
+     * @param {Object} options Options {set: 1, preset: 'presetName'}
+     */
+    JoomlaTinyMCEBuilder.prototype.setPreset = function (options) {
+        var set = options.set, preset = this.options.toolbarPreset[options.preset] || null;
+
+        if (!preset) {
+            throw new Error('Unknown Preset "' + options.preset + '"');
+        }
+
+        var $container, type;
+        for (var group in preset) {
+            if (!preset.hasOwnProperty(group)) {
+                continue;
+            }
+
+            // Find correct container for current set
+            if (group === 'menu') {
+                type = 'menu';
+                $container = this.$targetMenu.filter('[data-group="' + group + '"][data-set="' + set + '"]');
+            } else {
+                type = 'toolbar'
+                $container = this.$targetToolbar.filter('[data-group="' + group + '"][data-set="' + set + '"]');
+            }
+
+            // Reset existing values
+            $container.empty();
+
+            // Set new
+            this.renderBar($container, type, preset[group], true);
+        }
+    };
+
+    /**
+     * Clear the pane for specific set
+     * @param {Object} options Options {set: 1}
+     */
+    JoomlaTinyMCEBuilder.prototype.clearPane = function (options) {
+        var set = options.set;
+
+        this.$targetMenu.filter('[data-set="' + set + '"]').empty();
+        this.$targetToolbar.filter('[data-set="' + set + '"]').empty();
+    };
+
+
+    // Init the builder
+    $(document).ready(function(){
+        var options = Joomla.getOptions ? Joomla.getOptions('plg_editors_tinymce_builder', {})
+        			:  (Joomla.optionsStorage.plg_editors_tinymce_builder || {});
+
+        new JoomlaTinyMCEBuilder($('#joomla-tinymce-builder'), options);
+
+        $("#set-tabs a").on('click', function (event) {
+            event.preventDefault();
+            $(this).tab("show");
+        });
+    });
+}(jQuery));
diff --git a/plugins/editors/tinymce/field/tinymcebuilder.php b/plugins/editors/tinymce/field/tinymcebuilder.php
new file mode 100644
index 0000000000000..f11236bcaab97
--- /dev/null
+++ b/plugins/editors/tinymce/field/tinymcebuilder.php
@@ -0,0 +1,117 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Editors.tinymce
+ *
+ * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Form Field class for the TinyMCE editor.
+ *
+ * @package     Joomla.Plugin
+ * @subpackage  Editors.tinymce
+ * @since       __DEPLOY_VERSION__
+ */
+class JFormFieldTinymceBuilder extends JFormField
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var    string
+	 * @since  __DEPLOY_VERSION__
+	 */
+	protected $type = 'tinymcebuilder';
+
+	/**
+	 * Name of the layout being used to render the field
+	 *
+	 * @var    string
+	 * @since  __DEPLOY_VERSION__
+	 */
+	protected $layout = 'plugins.editors.tinymce.field.tinymcebuilder';
+
+	/**
+	 * Method to get the data to be passed to the layout for rendering.
+	 *
+	 * @return  array
+	 *
+	 * @since  __DEPLOY_VERSION__
+	 */
+	protected function getLayoutData()
+	{
+		$data       = parent::getLayoutData();
+		$valueAll   = (object) $this->form->getValue('params');
+		$setsAmount = empty($valueAll->sets_amount) ? 3 : $valueAll->sets_amount;
+
+		// Get the plugin
+		require_once JPATH_PLUGINS . '/editors/tinymce/tinymce.php';
+
+		$menus = array(
+			'edit'   => array('label' => 'Edit'),
+			'insert' => array('label' => 'Insert'),
+			'view'   => array('label' => 'View'),
+			'format' => array('label' => 'Format'),
+			'table'  => array('label' => 'Table'),
+			'tools'  => array('label' => 'Tools'),
+		);
+
+		$data['menus']         = $menus;
+		$data['menubarSource'] = array_keys($menus);
+		$data['buttons']       = PlgEditorTinymce::getKnownButtons();
+		$data['buttonsSource'] = array_keys($data['buttons']);
+		$data['toolbarPreset'] = PlgEditorTinymce::getToolbarPreset();
+		$data['setsAmount']    = $setsAmount;
+
+		// Get array of sets names
+		for ($i = 0; $i < $setsAmount; $i++)
+		{
+			$data['setsNames'][$i] = JText::sprintf('PLG_TINY_SET_TITLE', $i);
+		}
+
+		krsort($data['setsNames']);
+
+		// Prepare the forms for each set
+		$setsForms  = array();
+		$formsource = JPATH_PLUGINS . '/editors/tinymce/form/setoptions.xml';
+
+		// Check the old values for B/C
+		$valueOld = new stdClass;
+		if ($this->value && empty($this->value['setoptions']))
+		{
+			$valueOld = $valueAll;
+		}
+
+		foreach (array_keys($data['setsNames']) as $num)
+		{
+			$formname = 'set.form.' . $num;
+			$control  = $this->name . '[setoptions][' . $num . ']';
+
+			$setsForms[$num] = JForm::getInstance($formname, $formsource, array('control' => $control));
+
+			// Bind the values
+
+			if (empty($this->value['setoptions'][$num]))
+			{
+				$formValues = $valueOld;
+
+				// Predefine access: 0 for special, 1 for registered, all else is public
+				$formValues->access = !$num ? 3 : ($num === 1 ? 2 : 1);
+			}
+			else
+			{
+				$formValues = $this->value['setoptions'][$num];
+			}
+
+			$setsForms[$num]->bind($formValues);
+		}
+
+		$data['setsForms'] = $setsForms;
+
+		return $data;
+	}
+
+}
diff --git a/plugins/editors/tinymce/form/setoptions.xml b/plugins/editors/tinymce/form/setoptions.xml
new file mode 100644
index 0000000000000..bc1cd781215b6
--- /dev/null
+++ b/plugins/editors/tinymce/form/setoptions.xml
@@ -0,0 +1,310 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+    <field
+            name="access"
+            type="accesslevel"
+            label="JFIELD_ACCESS_LABEL"
+            description="JFIELD_ACCESS_DESC"
+    />
+
+    <field
+            name="skins"
+            type="note"
+            label="PLG_TINY_FIELD_SKIN_INFO_LABEL"
+            description="PLG_TINY_FIELD_SKIN_INFO_DESC"
+    />
+
+    <field
+            name="skin"
+            type="skins"
+            label="PLG_TINY_FIELD_SKIN_LABEL"
+            description="PLG_TINY_FIELD_SKIN_DESC"
+    />
+
+    <field
+            name="skin_admin"
+            type="skins"
+            label="PLG_TINY_FIELD_SKIN_ADMIN_LABEL"
+            description="PLG_TINY_FIELD_SKIN_ADMIN_DESC"
+    />
+
+    <field
+            name="mobile"
+            type="radio"
+            label="PLG_TINY_FIELD_MOBILE_LABEL"
+            description="PLG_TINY_FIELD_MOBILE_DESC"
+            class="btn-group btn-group-yesno"
+            default="0"
+    >
+        <option value="1">JON</option>
+        <option value="0">JOFF</option>
+    </field>
+
+    <field
+            name="drag_drop"
+            type="radio"
+            label="PLG_TINY_FIELD_DRAG_DROP_LABEL"
+            description="PLG_TINY_FIELD_DRAG_DROP_DESC"
+            class="btn-group btn-group-yesno"
+            default="1"
+    >
+        <option value="1">JON</option>
+        <option value="0">JOFF</option>
+    </field>
+
+    <field
+            name="path"
+            type="text"
+            label="PLG_TINY_FIELD_CUSTOM_PATH_LABEL"
+            description="PLG_TINY_FIELD_CUSTOM_PATH_DESC"
+            class="input-xxlarge"
+            showon="drag_drop:1"
+    />
+
+    <field
+            name="entity_encoding"
+            type="list"
+            label="PLG_TINY_FIELD_ENCODING_LABEL"
+            description="PLG_TINY_FIELD_ENCODING_DESC"
+            default="raw"
+    >
+        <option value="named">PLG_TINY_FIELD_VALUE_NAMED</option>
+        <option value="numeric">PLG_TINY_FIELD_VALUE_NUMERIC</option>
+        <option value="raw">PLG_TINY_FIELD_VALUE_RAW</option>
+    </field>
+
+    <field
+            name="lang_mode"
+            type="radio"
+            label="PLG_TINY_FIELD_LANGSELECT_LABEL"
+            description="PLG_TINY_FIELD_LANGSELECT_DESC"
+            class="btn-group btn-group-yesno"
+            default="1"
+    >
+        <option value="1">JON</option>
+        <option value="0">JOFF</option>
+    </field>
+
+    <field
+            name="lang_code"
+            type="filelist"
+            label="PLG_TINY_FIELD_LANGCODE_LABEL"
+            description="PLG_TINY_FIELD_LANGCODE_DESC"
+            class="inputbox"
+            stripext="1"
+            directory="media/editors/tinymce/langs/"
+            hide_none="1"
+            default="en"
+            hide_default="1"
+            filter="\.js$"
+            size="10"
+            showon="lang_mode:0"
+    />
+
+    <field
+            name="text_direction"
+            type="list"
+            label="PLG_TINY_FIELD_DIRECTION_LABEL"
+            description="PLG_TINY_FIELD_DIRECTION_DESC"
+            default="ltr"
+    >
+        <option value="ltr">PLG_TINY_FIELD_VALUE_LTR</option>
+        <option value="rtl">PLG_TINY_FIELD_VALUE_RTL</option>
+    </field>
+
+    <field
+            name="content_css"
+            type="radio"
+            label="PLG_TINY_FIELD_CSS_LABEL"
+            description="PLG_TINY_FIELD_CSS_DESC"
+            class="btn-group btn-group-yesno"
+            default="1"
+    >
+        <option value="1">JON</option>
+        <option value="0">JOFF</option>
+    </field>
+
+    <field
+            name="content_css_custom"
+            type="text"
+            label="PLG_TINY_FIELD_CUSTOM_CSS_LABEL"
+            description="PLG_TINY_FIELD_CUSTOM_CSS_DESC"
+            class="input-xxlarge"
+    />
+
+    <field
+            name="relative_urls"
+            type="list"
+            label="PLG_TINY_FIELD_URLS_LABEL"
+            description="PLG_TINY_FIELD_URLS_DESC"
+            default="1"
+    >
+        <option value="0">PLG_TINY_FIELD_VALUE_ABSOLUTE</option>
+        <option value="1">PLG_TINY_FIELD_VALUE_RELATIVE</option>
+    </field>
+
+    <field
+            name="newlines"
+            type="list"
+            label="PLG_TINY_FIELD_NEWLINES_LABEL"
+            description="PLG_TINY_FIELD_NEWLINES_DESC"
+            default="0"
+    >
+        <option value="1">PLG_TINY_FIELD_VALUE_BR</option>
+        <option value="0">PLG_TINY_FIELD_VALUE_P</option>
+    </field>
+
+    <field
+            name="use_config_textfilters"
+            type="radio"
+            label="PLG_TINY_CONFIG_TEXTFILTER_ACL_LABEL"
+            description="PLG_TINY_CONFIG_TEXTFILTER_ACL_DESC"
+            class="btn-group btn-group-yesno"
+            default="0"
+    >
+        <option value="1">JON</option>
+        <option value="0">JOFF</option>
+    </field>
+
+    <field
+            name="invalid_elements"
+            type="text"
+            label="PLG_TINY_FIELD_PROHIBITED_LABEL"
+            description="PLG_TINY_FIELD_PROHIBITED_DESC"
+            showon="use_config_textfilters:0"
+            default="script,applet,iframe"
+            class="input-xxlarge"
+    />
+
+    <field
+            name="valid_elements"
+            type="text"
+            label="PLG_TINY_FIELD_VALIDELEMENTS_LABEL"
+            description="PLG_TINY_FIELD_VALIDELEMENTS_DESC"
+            showon="use_config_textfilters:0"
+            class="input-xxlarge"
+    />
+
+    <field
+            name="extended_elements"
+            type="text"
+            label="PLG_TINY_FIELD_ELEMENTS_LABEL"
+            description="PLG_TINY_FIELD_ELEMENTS_DESC"
+            showon="use_config_textfilters:0"
+            class="input-xxlarge"
+    />
+
+    <!-- Extra plugins -->
+    <field
+            name="resizing"
+            type="radio"
+            label="PLG_TINY_FIELD_RESIZING_LABEL"
+            description="PLG_TINY_FIELD_RESIZING_DESC"
+            class="btn-group btn-group-yesno"
+            default="1"
+    >
+        <option value="1">JON</option>
+        <option value="0">JOFF</option>
+    </field>
+
+    <field
+            name="resize_horizontal"
+            type="radio"
+            label="PLG_TINY_FIELD_RESIZE_HORIZONTAL_LABEL"
+            description="PLG_TINY_FIELD_RESIZE_HORIZONTAL_DESC"
+            class="btn-group btn-group-yesno"
+            default="1"
+            showon="resizing:1"
+    >
+        <option value="1">JON</option>
+        <option value="0">JOFF</option>
+    </field>
+
+    <field
+            name="element_path"
+            type="radio"
+            label="PLG_TINY_FIELD_PATH_LABEL"
+            description="PLG_TINY_FIELD_PATH_DESC"
+            class="btn-group btn-group-yesno"
+            default="0"
+    >
+        <option value="1">JON</option>
+        <option value="0">JOFF</option>
+    </field>
+
+    <field
+            name="wordcount"
+            type="radio"
+            label="PLG_TINY_FIELD_WORDCOUNT_LABEL"
+            description="PLG_TINY_FIELD_WORDCOUNT_DESC"
+            class="btn-group btn-group-yesno"
+            default="1"
+    >
+        <option value="1">JON</option>
+        <option value="0">JOFF</option>
+    </field>
+
+    <field
+            name="image_advtab"
+            type="radio"
+            label="PLG_TINY_FIELD_ADVIMAGE_LABEL"
+            description="PLG_TINY_FIELD_ADVIMAGE_DESC"
+            class="btn-group btn-group-yesno"
+            default="0"
+    >
+        <option value="1">JON</option>
+        <option value="0">JOFF</option>
+    </field>
+
+    <field
+            name="advlist"
+            type="radio"
+            label="PLG_TINY_FIELD_ADVLIST_LABEL"
+            description="PLG_TINY_FIELD_ADVLIST_DESC"
+            class="btn-group btn-group-yesno"
+            default="1"
+    >
+        <option value="1">JON</option>
+        <option value="0">JOFF</option>
+    </field>
+
+    <field
+            name="autosave"
+            type="radio"
+            label="PLG_TINY_FIELD_SAVEWARNING_LABEL"
+            description="PLG_TINY_FIELD_SAVEWARNING_DESC"
+            class="btn-group btn-group-yesno"
+            default="1"
+    >
+        <option value="1">JON</option>
+        <option value="0">JOFF</option>
+    </field>
+
+    <field
+            name="contextmenu"
+            type="radio"
+            label="PLG_TINY_FIELD_CONTEXTMENU_LABEL"
+            description="PLG_TINY_FIELD_CONTEXTMENU_DESC"
+            class="btn-group btn-group-yesno"
+            default="1"
+    >
+        <option value="1">JON</option>
+        <option value="0">JOFF</option>
+    </field>
+
+    <field
+            name="custom_plugin"
+            type="text"
+            label="PLG_TINY_FIELD_CUSTOMPLUGIN_LABEL"
+            description="PLG_TINY_FIELD_CUSTOMPLUGIN_DESC"
+            class="input-xxlarge"
+    />
+
+    <field
+            name="custom_button"
+            type="text"
+            label="PLG_TINY_FIELD_CUSTOMBUTTON_LABEL"
+            description="PLG_TINY_FIELD_CUSTOMBUTTON_DESC"
+            class="input-xxlarge"
+    />
+</form>
\ No newline at end of file
diff --git a/plugins/editors/tinymce/tinymce.php b/plugins/editors/tinymce/tinymce.php
index f544a08ef0035..0b22651f2f2cd 100644
--- a/plugins/editors/tinymce/tinymce.php
+++ b/plugins/editors/tinymce/tinymce.php
@@ -168,13 +168,42 @@ public function onDisplay($name, $content, $width, $height, $col, $row, $buttons
 		$app      = JFactory::getApplication();
 		$user     = JFactory::getUser();
 		$language = JFactory::getLanguage();
-		$mode     = (int) $this->params->get('mode', 1);
 		$theme    = 'modern';
+		$access   = array_flip($user->getAuthorisedViewLevels());
+
+		// Get configuration for User view level
+		$setAccess       = array();
+		$extraOptions    = new stdClass;
+		$extraOptionsAll = $this->params->get('configuration.setoptions', array());
+
+		foreach ($extraOptionsAll as $set => $val)
+		{
+			$setAccess[$set] = empty($val->access) ? 1 : $val->access;
+
+			if (isset($access[$setAccess[$set]]))
+			{
+				$extraOptions = $val;
+			}
+		}
+
+		$toolbarParams    = new stdClass;
+		$toolbarParamsAll = $this->params->get('configuration.toolbars', array());
+
+		foreach ($toolbarParamsAll as $set => $val)
+		{
+			if (isset($access[$setAccess[$set]]))
+			{
+				$toolbarParams = $val;
+			}
+		}
+
+		// Merge the params
+		$levelParams = new Joomla\Registry\Registry($toolbarParams);
+		$levelParams->loadObject($extraOptions);
 
 		// List the skins
 		$skindirs = glob(JPATH_ROOT . '/media/editors/tinymce/skins' . '/*', GLOB_ONLYDIR);
 
-
 		// Set the selected skin
 		$skin = 'lightgray';
 		$side = $app->isAdmin() ? 'skin_admin' : 'skin';
@@ -210,8 +239,8 @@ public function onDisplay($name, $content, $width, $height, $col, $row, $buttons
 			$text_direction = 'rtl';
 		}
 
-		$use_content_css    = $this->params->get('content_css', 1);
-		$content_css_custom = $this->params->get('content_css_custom', '');
+		$use_content_css    = $levelParams->get('content_css', 1);
+		$content_css_custom = $levelParams->get('content_css_custom', '');
 
 		/*
 		 * Lets get the default template for the site application
@@ -232,7 +261,7 @@ public function onDisplay($name, $content, $width, $height, $col, $row, $buttons
 		{
 			$app->enqueueMessage(JText::_('JERROR_AN_ERROR_HAS_OCCURRED'), 'error');
 
-			return;
+			return '';
 		}
 
 		$content_css    = null;
@@ -289,7 +318,7 @@ public function onDisplay($name, $content, $width, $height, $col, $row, $buttons
 		$ignore_filter = false;
 
 		// Text filtering
-		if ($this->params->get('use_config_textfilters', 0))
+		if ($levelParams->get('use_config_textfilters', 0))
 		{
 			// Use filters from com_config
 			$filter = static::getGlobalFilters();
@@ -305,24 +334,18 @@ public function onDisplay($name, $content, $width, $height, $col, $row, $buttons
 
 			// Valid elements are all whitelist entries in com_config, which are now missing in the tagBlacklist
 			$default_filter = JFilterInput::getInstance();
-			$valid_elements =	implode(',', array_diff($default_filter->tagBlacklist, $tagBlacklist));
+			$valid_elements = implode(',', array_diff($default_filter->tagBlacklist, $tagBlacklist));
 
 			$extended_elements = '';
 		}
 		else
 		{
 			// Use filters from TinyMCE params
-			$invalid_elements  = $this->params->get('invalid_elements', 'script,applet,iframe');
-			$extended_elements = $this->params->get('extended_elements', '');
-			$valid_elements    = $this->params->get('valid_elements', '');
+			$invalid_elements  = trim($levelParams->get('invalid_elements', 'script,applet,iframe'));
+			$extended_elements = trim($levelParams->get('extended_elements', ''));
+			$valid_elements    = trim($levelParams->get('valid_elements', ''));
 		}
 
-		// Advanced Options
-		$access = $user->getAuthorisedViewLevels();
-
-		// Flip for performance, so we can direct check for the key isset($access[$key])
-		$access = array_flip($access);
-
 		$html_height = $this->params->get('html_height', '550');
 		$html_width  = $this->params->get('html_width', '');
 
@@ -331,270 +354,72 @@ public function onDisplay($name, $content, $width, $height, $col, $row, $buttons
 			$html_width = '';
 		}
 
-		// Image advanced options
-		$image_advtab = $this->params->get('image_advtab', true);
-
-		if (isset($access[$image_advtab]))
-		{
-			$image_advtab = true;
-		}
-		else
-		{
-			$image_advtab = false;
-		}
-
 		// The param is true for vertical resizing only, false or both
-		$resizing          = $this->params->get('resizing', '1');
-		$resize_horizontal = $this->params->get('resize_horizontal', '1');
+		$resizing          = (bool) $levelParams->get('resizing', true);
+		$resize_horizontal = (bool) $levelParams->get('resize_horizontal', true);
 
-		if ($resizing || $resizing == 'true')
-		{
-			if ($resize_horizontal || $resize_horizontal == 'true')
-			{
-				$resizing = 'both';
-			}
-			else
-			{
-				$resizing = true;
-			}
-		}
-		else
+		if ($resizing && $resize_horizontal)
 		{
-			$resizing = false;
+			$resizing = 'both';
 		}
 
-		$toolbar1_add   = array();
-		$toolbar2_add   = array();
-		$toolbar3_add   = array();
-		$toolbar4_add   = array();
-		$elements       = array();
-		$plugins        = array(
+		// Set of always available plugins
+		$plugins  = array(
 			'autolink',
 			'lists',
-			'image',
-			'charmap',
-			'print',
-			'preview',
-			'anchor',
-			'pagebreak',
-			'code',
 			'save',
-			'textcolor',
 			'colorpicker',
-			'importcss');
-		$toolbar1_add[] = 'bold';
-		$toolbar1_add[] = 'italic';
-		$toolbar1_add[] = 'underline';
-		$toolbar1_add[] = 'strikethrough';
-
-		// Alignment buttons
-		$alignment = $this->params->get('alignment', 1);
-
-		if (isset($access[$alignment]))
-		{
-			$toolbar1_add[] = '|';
-			$toolbar1_add[] = 'alignleft';
-			$toolbar1_add[] = 'aligncenter';
-			$toolbar1_add[] = 'alignright';
-			$toolbar1_add[] = 'alignjustify';
-		}
-
-		$toolbar1_add[] = '|';
-		$toolbar1_add[] = 'styleselect';
-		$toolbar1_add[] = '|';
-		$toolbar1_add[] = 'formatselect';
-
-		// Fonts
-		$fonts = $this->params->get('fonts', 1);
-
-		if (isset($access[$fonts]))
-		{
-			$toolbar1_add[] = 'fontselect';
-			$toolbar1_add[] = 'fontsizeselect';
-		}
-
-		// Search & replace
-		$searchreplace = $this->params->get('searchreplace', 1);
-
-		if (isset($access[$searchreplace]))
-		{
-			$plugins[]      = 'searchreplace';
-			$toolbar2_add[] = 'searchreplace';
-		}
-
-		$toolbar2_add[] = '|';
-		$toolbar2_add[] = 'bullist';
-		$toolbar2_add[] = 'numlist';
-		$toolbar2_add[] = '|';
-		$toolbar2_add[] = 'outdent';
-		$toolbar2_add[] = 'indent';
-		$toolbar2_add[] = '|';
-		$toolbar2_add[] = 'undo';
-		$toolbar2_add[] = 'redo';
-		$toolbar2_add[] = '|';
-
-		// Insert date and/or time plugin
-		$insertdate = $this->params->get('insertdate', 1);
-
-		if (isset($access[$insertdate]))
-		{
-			$plugins[]      = 'insertdatetime';
-			$toolbar4_add[] = 'inserttime';
-		}
-
-		// Link plugin
-		$link = $this->params->get('link', 1);
-
-		if (isset($access[$link]))
-		{
-			$plugins[]      = 'link';
-			$toolbar2_add[] = 'link';
-			$toolbar2_add[] = 'unlink';
-		}
-
-		$toolbar2_add[] = 'anchor';
-		$toolbar2_add[] = 'image';
-		$toolbar2_add[] = '|';
-		$toolbar2_add[] = 'code';
-
-		// Colors
-		$colors = $this->params->get('colors', 1);
-
-		if (isset($access[$colors]))
-		{
-			$toolbar2_add[] = '|';
-			$toolbar2_add[] = 'forecolor,backcolor';
-		}
-
-		// Fullscreen
-		$fullscreen = $this->params->get('fullscreen', 1);
-
-		if (isset($access[$fullscreen]))
-		{
-			$plugins[]      = 'fullscreen';
-			$toolbar2_add[] = '|';
-			$toolbar2_add[] = 'fullscreen';
-		}
-
-		// Table
-		$table = $this->params->get('table', 1);
-
-		if (isset($access[$table]))
-		{
-			$plugins[]      = 'table';
-			$toolbar3_add[] = 'table';
-			$toolbar3_add[] = '|';
-		}
-
-		$toolbar3_add[] = 'subscript';
-		$toolbar3_add[] = 'superscript';
-		$toolbar3_add[] = '|';
-		$toolbar3_add[] = 'charmap';
-
-		// Emotions
-		$smilies = $this->params->get('smilies', 1);
-
-		if (isset($access[$smilies]))
-		{
-			$plugins[]      = 'emoticons';
-			$toolbar3_add[] = 'emoticons';
-		}
-
-		// Media plugin
-		$media = $this->params->get('media', 1);
-
-		if (isset($access[$media]))
-		{
-			$plugins[]      = 'media';
-			$toolbar3_add[] = 'media';
-		}
-
-		// Horizontal line
-		$hr = $this->params->get('hr', 1);
-
-		if (isset($access[$hr]))
-		{
-			$plugins[]      = 'hr';
-			$elements[]     = 'hr[id|title|alt|class|width|size|noshade]';
-			$toolbar3_add[] = 'hr';
-		}
-		else
-		{
-			$elements[] = 'hr[id|class|title|alt]';
-		}
-
-		// RTL/LTR buttons
-		$directionality = $this->params->get('directionality', 1);
-
-		if (isset($access[$directionality]))
-		{
-			$plugins[]      = 'directionality';
-			$toolbar3_add[] = 'ltr rtl';
-		}
-
-		if ($extended_elements != "")
-		{
-			$elements = explode(',', $extended_elements);
-		}
-
-		$toolbar4_add[] = 'cut';
-		$toolbar4_add[] = 'copy';
+			'importcss',
+		);
 
-		// Paste
-		$paste = $this->params->get('paste', 1);
+		// Allowed elements
+		$elements = array(
+			'hr[id|title|alt|class|width|size|noshade]',
+		);
 
-		if (isset($access[$paste]))
+		if ($extended_elements)
 		{
-			$plugins[]      = 'paste';
-			$toolbar4_add[] = 'paste';
+			$elements = array_merge($elements, explode(',', $extended_elements));
 		}
 
-		$toolbar4_add[] = '|';
-
-		// Visualchars
-		$visualchars = $this->params->get('visualchars', 1);
+		// Prepare the toolbar/menubar
+		$knownButtons = static::getKnownButtons();
 
-		if (isset($access[$visualchars]))
+		// Check if there no value at all
+		if (!$levelParams->get('menu') && !$levelParams->get('toolbar1') && !$levelParams->get('toolbar2'))
 		{
-			$plugins[]      = 'visualchars';
-			$toolbar4_add[] = 'visualchars';
-		}
+			// Set from preset
+			$presets = static::getToolbarPreset();
 
-		// Visualblocks
-		$visualblocks = $this->params->get('visualblocks', 1);
+			// Presets: 3 is special = advances, 2 is registered = medium, all else is public = simple
+			$preset = isset($access[3]) ? $presets['advanced'] :
+				(isset($access[2]) ? $presets['medium'] : $presets['simple']);
 
-		if (isset($access[$visualblocks]))
-		{
-			$plugins[]      = 'visualblocks';
-			$toolbar4_add[] = 'visualblocks';
+			$levelParams->loadArray($preset);
 		}
 
-		// Non-breaking
-		$nonbreaking = $this->params->get('nonbreaking', 1);
+		$menubar  = (array) $levelParams->get('menu', array());
+		$toolbar1 = (array) $levelParams->get('toolbar1', array());
+		$toolbar2 = (array) $levelParams->get('toolbar2', array());
 
-		if (isset($access[$nonbreaking]))
-		{
-			$plugins[]      = 'nonbreaking';
-			$toolbar4_add[] = 'nonbreaking';
-		}
-
-		// Blockquote
-		$blockquote = $this->params->get('blockquote', 1);
+		// Make an easy way to check which button is enabled
+		$allButtons = array_merge($toolbar1, $toolbar2);
+		$allButtons = array_combine($allButtons, $allButtons);
 
-		if (isset($access[$blockquote]))
+		// Check for button-specific plugins
+		foreach ($allButtons as $btnName)
 		{
-			$toolbar4_add[] = 'blockquote';
+			if (!empty($knownButtons[$btnName]['plugin']))
+			{
+				$plugins[] = $knownButtons[$btnName]['plugin'];
+			}
 		}
 
 		// Template
-		$template = $this->params->get('template', 1);
 		$templates = array();
 
-		if (isset($access[$template]))
+		if (!empty($allButtons['template']))
 		{
-			$plugins[]      = 'template';
-			$toolbar4_add[] = 'template';
-
 			// Note this check for the template_list.js file will be removed in Joomla 4.0
 			if (is_file(JPATH_ROOT . "/media/editors/tinymce/templates/template_list.js"))
 			{
@@ -653,99 +478,51 @@ public function onDisplay($name, $content, $width, $height, $col, $row, $buttons
 			}
 		}
 
-		// Print
-		$print = $this->params->get('print', 1);
-
-		if (isset($access[$print]))
-		{
-			$plugins[]      = 'print';
-			$toolbar4_add[] = '|';
-			$toolbar4_add[] = 'print';
-			$toolbar4_add[] = 'preview';
-		}
-
-		// Spellchecker
-		$spell = $this->params->get('spell', 0);
-
-		if (isset($access[$spell]))
-		{
-			$plugins[]      = 'spellchecker';
-			$toolbar4_add[] = '|';
-			$toolbar4_add[] = 'spellchecker';
-		}
-
-		// Wordcount
-		$wordcount = $this->params->get('wordcount', 1);
-
-		if (isset($access[$wordcount]))
-		{
-			$plugins[] = 'wordcount';
-		}
-
-		// Advlist
-		$advlist = $this->params->get('advlist', 1);
-
-		if (isset($access[$advlist]))
-		{
-			$plugins[] = 'advlist';
-		}
-
-		// Codesample
-		$advlist = $this->params->get('code_sample', 1);
-
-		if (isset($access[$advlist]))
-		{
-			$plugins[]      = 'codesample';
-			$toolbar4_add[] = 'codesample';
-		}
-
-		// Autosave
-		$autosave = $this->params->get('autosave', 1);
-
-		if (isset($access[$autosave]))
-		{
-			$plugins[] = 'autosave';
-		}
-
-		// Context menu
-		$contextmenu = $this->params->get('contextmenu', 1);
-
-		if (isset($access[$contextmenu]))
+		// Check for extra plugins, from the setoptions form
+		foreach (array('wordcount' => 1, 'advlist' => 1, 'autosave' => 1, 'contextmenu' => 1) as $pName => $def)
 		{
-			$plugins[] = 'contextmenu';
+			if ($levelParams->get($pName, $def))
+			{
+				$plugins[] = $pName;
+			}
 		}
 
-		$custom_plugin = $this->params->get('custom_plugin', '');
+		// User custom plugins and buttons
+		$custom_plugin = trim($levelParams->get('custom_plugin', ''));
+		$custom_button = trim($levelParams->get('custom_button', ''));
 
-		if ($custom_plugin != "")
+		if ($custom_plugin)
 		{
-			$plugins[] = $custom_plugin;
+			$separator = strpos($custom_plugin, ',') !== false ? ',' : ' ';
+			$plugins   = array_merge($plugins, explode($separator, $custom_plugin));
 		}
 
-		$custom_button = $this->params->get('custom_button', '');
-
-		if ($custom_button != "")
+		if ($custom_button)
 		{
-			$toolbar4_add[] = $custom_button;
+			$separator = strpos($custom_button, ',') !== false ? ',' : ' ';
+			$toolbar2  = array_merge($toolbar2, explode($separator, $custom_button));
 		}
 
 		// We shall put the XTD button inside tinymce
 		$btns      = $this->tinyButtons($id, $buttons);
 		$btnsNames = $btns['names'];
-		$tinyBtns  = $btns['script'];
+		$tinyBtns  = implode("; ", $btns['script']);
 
 		if (!empty($btnsNames))
 		{
+			// Add them to the first toolbar
+			$toolbar1 = array_merge($toolbar1, array('|'), $btnsNames);
+
 			JHtml::_('script', 'system/tiny-close.min.js', array('version' => 'auto', 'relative' => true), array('defer' => 'defer'));
 		}
 
 		// Drag and drop Images
 		$allowImgPaste = false;
-		$dragDropPlg   = '';
-		$dragdrop      = $this->params->get('drag_drop', 1);
+		$dragdrop      = $levelParams->get('drag_drop', 1);
 
 		if ($dragdrop && $user->authorise('core.create', 'com_media'))
 		{
+			$plugins[]     = 'jdragdrop';
 			$allowImgPaste = true;
 			$isSubDir      = '';
 			$session       = JFactory::getSession();
@@ -766,7 +543,7 @@ public function onDisplay($name, $content, $width, $height, $col, $row, $buttons
 			}
 
 			// Get specific path
-			$tempPath = $this->params->get('path', '');
+			$tempPath = $levelParams->get('path', '');
 
 			if (!empty($tempPath))
 			{
@@ -774,8 +551,6 @@ public function onDisplay($name, $content, $width, $height, $col, $row, $buttons
 				$tempPath = ltrim($tempPath, '/');
 			}
 
-			$dragDropPlg = 'jdragdrop';
-
 			JText::script('PLG_TINY_ERR_UNSUPPORTEDBROWSER');
 			$doc->addScriptDeclaration(
 				"
@@ -786,24 +561,7 @@ public function onDisplay($name, $content, $width, $height, $col, $row, $buttons
 			);
 		}
 
-		// Prepare config variables
-		$plugins  = implode(',', $plugins);
-		$elements = implode(',', $elements);
-
-		// Prepare config variables
-		$toolbar1 = implode(' ', $toolbar1_add) . ' | '
-			. implode(' ', $toolbar2_add) . ' | '
-			. implode(' ', $toolbar3_add) . ' | '
-			. implode(' ', $toolbar4_add) . ' | '
-			. implode(" | ", $btnsNames);
-		$toolbar5 = implode(" | ", $btnsNames);
-
-		// The buttons script
-		$tinyBtns = implode("; ", $tinyBtns);
-
-		// See if mobileVersion is activated
-		$mobileVersion = $this->params->get('mobile', 0);
-
+		// Build the final options set
 		$scriptOptions = array(
 			'suffix'  => '.min',
 			'baseURL' => JUri::root(true) . '/media/editors/tinymce',
@@ -814,26 +572,43 @@ public function onDisplay($name, $content, $width, $height, $col, $row, $buttons
 			'theme'  => $theme,
 			'schema' => 'html5',
 
+			// Toolbars
+			'menubar'  => empty($menubar)  ? false : implode(' ', array_unique($menubar)),
+			'toolbar1' => empty($toolbar1) ? null  : implode(' ', $toolbar1),
+			'toolbar2' => empty($toolbar2) ? null  : implode(' ', $toolbar2),
+
+			'plugins'  => implode(',', array_unique($plugins)),
+
 			// Cleanup/Output
 			'inline_styles'    => true,
 			'gecko_spellcheck' => true,
-			'entity_encoding'  => $this->params->get('entity_encoding', 'raw'),
+			'entity_encoding'  => $levelParams->get('entity_encoding', 'raw'),
 			'verify_html'      => !$ignore_filter,
 
+			'valid_elements'          => $valid_elements,
+			'extended_valid_elements' => implode(',', $elements),
+			'invalid_elements'        => $invalid_elements,
+
 			// URL
-			'relative_urls'      => (bool) $this->params->get('relative_urls', true),
+			'relative_urls'      => (bool) $levelParams->get('relative_urls', true),
 			'remove_script_host' => false,
 
 			// Layout
 			'content_css'        => $content_css,
 			'document_base_url'  => JUri::root(true) . '/',
 			'paste_data_images'  => $allowImgPaste,
+			'importcss_append'   => true,
+			'height'             => $html_height,
+			'width'              => $html_width,
+			'resize'             => $resizing,
+			'templates'          => $templates,
+			'image_advtab'       => (bool) $levelParams->get('image_advtab', false),
 
 			// @TODO make it better, do not generate JavaScript in PHP !!!
 			'setupCallbackString' => $tinyBtns,
 		);
 
-		if ($this->params->get('newlines'))
+		if ($levelParams->get('newlines'))
 		{
 			// Break
 			$scriptOptions['force_br_newlines'] = true;
@@ -848,6 +623,22 @@ public function onDisplay($name, $content, $width, $height, $col, $row, $buttons
 			$scriptOptions['forced_root_block'] = 'p';
 		}
 
+		$scriptOptions['rel_list'] = array(
+			array('title' => 'Alternate', 'value' => 'alternate'),
+			array('title' => 'Author', 'value' => 'author'),
+			array('title' => 'Bookmark', 'value' => 'bookmark'),
+			array('title' => 'Help', 'value' => 'help'),
+			array('title' => 'License', 'value' => 'license'),
+			array('title' => 'Lightbox', 'value' => 'lightbox'),
+			array('title' => 'Next', 'value' => 'next'),
+			array('title' => 'No Follow', 'value' => 'nofollow'),
+			array('title' => 'No Referrer', 'value' => 'noreferrer'),
+			array('title' => 'Prefetch', 'value' => 'prefetch'),
+			array('title' => 'Prev', 'value' => 'prev'),
+			array('title' => 'Search', 'value' => 'search'),
+			array('title' => 'Tag', 'value' => 'tag'),
+		);
+
 		/**
 		 * Shrink the buttons if not on a mobile or if mobile view is off.
 		 * If mobile view is on force into simple mode and enlarge the buttons
@@ -856,68 +647,10 @@ public function onDisplay($name, $content, $width, $height, $col, $row, $buttons
 		{
 			$scriptOptions['toolbar_items_size'] = 'small';
 		}
-		elseif ($mobileVersion)
-		{
-			$mode = 0;
-		}
-
-		switch ($mode)
+		elseif ($levelParams->get('mobile', 0))
 		{
-			case 0: /* Simple mode*/
-				$scriptOptions['menubar']  = false;
-				$scriptOptions['toolbar1'] = 'bold italics underline strikethrough | undo redo | bullist numlist | code | ' . $toolbar5;
-				$scriptOptions['plugins']  = $dragDropPlg . ' code';
-
-				break;
-
-			case 1:
-			default: /* Advanced mode*/
-				$toolbar1 = "bold italic underline strikethrough | alignleft aligncenter alignright alignjustify | formatselect | bullist numlist "
-					. "| outdent indent | undo redo | link unlink anchor code | hr table | subscript superscript | charmap";
-
-				$scriptOptions['valid_elements'] = $valid_elements;
-				$scriptOptions['extended_valid_elements'] = $elements;
-				$scriptOptions['invalid_elements'] = $invalid_elements;
-				$scriptOptions['plugins']  = 'table link code hr charmap autolink lists importcss ' . $dragDropPlg;
-				$scriptOptions['toolbar1'] = $toolbar1 . ' | ' . $toolbar5;
-				$scriptOptions['removed_menuitems'] = 'newdocument';
-				$scriptOptions['importcss_append']  = true;
-				$scriptOptions['height'] = $html_height;
-				$scriptOptions['width']  = $html_width;
-				$scriptOptions['resize'] = $resizing;
-
-				break;
-
-			case 2: /* Extended mode*/
-				$scriptOptions['valid_elements'] = $valid_elements;
-				$scriptOptions['extended_valid_elements'] = $elements;
-				$scriptOptions['invalid_elements'] = $invalid_elements;
-				$scriptOptions['plugins']  = $plugins . ' ' . $dragDropPlg;
-				$scriptOptions['toolbar1'] = $toolbar1;
-				$scriptOptions['removed_menuitems'] = 'newdocument';
-				$scriptOptions['rel_list'] = array(
-					array('title' => 'Alternate', 'value' => 'alternate'),
-					array('title' => 'Author', 'value' => 'author'),
-					array('title' => 'Bookmark', 'value' => 'bookmark'),
-					array('title' => 'Help', 'value' => 'help'),
-					array('title' => 'License', 'value' => 'license'),
-					array('title' => 'Lightbox', 'value' => 'lightbox'),
-					array('title' => 'Next', 'value' => 'next'),
-					array('title' => 'No Follow', 'value' => 'nofollow'),
-					array('title' => 'No Referrer', 'value' => 'noreferrer'),
-					array('title' => 'Prefetch', 'value' => 'prefetch'),
-					array('title' => 'Prev', 'value' => 'prev'),
-					array('title' => 'Search', 'value' => 'search'),
-					array('title' => 'Tag', 'value' => 'tag'),
-				);
-				$scriptOptions['importcss_append'] = true;
-				$scriptOptions['image_advtab']     = $image_advtab;
-				$scriptOptions['height']    = $html_height;
-				$scriptOptions['width']     = $html_width;
-				$scriptOptions['resize']    = $resizing;
-				$scriptOptions['templates'] = $templates;
-
-				break;
+			$scriptOptions['menubar'] = false;
+			unset($scriptOptions['toolbar2']);
 		}
 
 		$options['tinyMCE']['default'] = $scriptOptions;
@@ -1236,4 +969,153 @@ protected static function getGlobalFilters()
 			return $filter;
 		}
 	}
+
+	/**
+	 * Return list of known TinyMCE buttons
+	 *
+	 * @return array
+	 *
+	 * @since __DEPLOY_VERSION__
+	 */
+	public static function getKnownButtons()
+	{
+		// See https://www.tinymce.com/docs/demo/full-featured/
+		// And https://www.tinymce.com/docs/plugins/
+		$buttons = array(
+
+			// General buttons
+			'|'              => array('label' => JText::_('PLG_TINY_TOOLBAR_BUTTON_SEPARATOR'), 'text' => '|'),
+
+			'undo'           => array('label' => JText::_('PLG_TINY_TOOLBAR_BUTTON_UNDO')),
+			'redo'           => array('label' => JText::_('PLG_TINY_TOOLBAR_BUTTON_REDO')),
+
+			'bold'           => array('label' => JText::_('PLG_TINY_TOOLBAR_BUTTON_BOLD')),
+			'italic'         => array('label' => JText::_('PLG_TINY_TOOLBAR_BUTTON_ITALIC')),
+			'underline'      => array('label' => JText::_('PLG_TINY_TOOLBAR_BUTTON_UNDERLINE')),
+			'strikethrough'  => array('label' => JText::_('PLG_TINY_TOOLBAR_BUTTON_STRIKETHROUGH')),
+			'styleselect'    => array('label' => JText::_('PLG_TINY_TOOLBAR_BUTTON_STYLESELECT'), 'text' => 'Formats'),
+			'formatselect'   => array('label' => JText::_('PLG_TINY_TOOLBAR_BUTTON_FORMATSELECT'), 'text' => 'Paragraph'),
+			'fontselect'     => array('label' => JText::_('PLG_TINY_TOOLBAR_BUTTON_FONTSELECT'), 'text' => 'Font'),
+			'fontsizeselect' => array('label' => JText::_('PLG_TINY_TOOLBAR_BUTTON_FONTSIZESELECT'), 'text' => 'Fontsize'),
+
+			'alignleft'     => array('label' => JText::_('PLG_TINY_TOOLBAR_BUTTON_ALIGNLEFT')),
+			'aligncenter'   => array('label' => JText::_('PLG_TINY_TOOLBAR_BUTTON_ALIGNCENTER')),
+			'alignright'    => array('label' => JText::_('PLG_TINY_TOOLBAR_BUTTON_ALIGNRIGHT')),
+			'alignjustify'  => array('label' => JText::_('PLG_TINY_TOOLBAR_BUTTON_ALIGNJUSTIFY')),
+
+			'outdent'       => array('label' => JText::_('PLG_TINY_TOOLBAR_BUTTON_OUTDENT')),
+			'indent'        => array('label' => JText::_('PLG_TINY_TOOLBAR_BUTTON_INDENT')),
+
+			'bullist'       => array('label' => JText::_('PLG_TINY_TOOLBAR_BUTTON_BULLIST')),
+			'numlist'       => array('label' => JText::_('PLG_TINY_TOOLBAR_BUTTON_NUMLIST')),
+
+			'link'          => array('label' => JText::_('PLG_TINY_TOOLBAR_BUTTON_LINK'), 'plugin' => 'link'),
+			'unlink'        => array('label' => JText::_('PLG_TINY_TOOLBAR_BUTTON_UNLINK'), 'plugin' => 'link'),
+
+			'subscript'     => array('label' => JText::_('PLG_TINY_TOOLBAR_BUTTON_SUBSCRIPT')),
+			'superscript'   => array('label' => JText::_('PLG_TINY_TOOLBAR_BUTTON_SUPERSCRIPT')),
+			'blockquote'    => array('label' => JText::_('PLG_TINY_TOOLBAR_BUTTON_BLOCKQUOTE')),
+
+			'cut'           => array('label' => JText::_('PLG_TINY_TOOLBAR_BUTTON_CUT')),
+			'copy'          => array('label' => JText::_('PLG_TINY_TOOLBAR_BUTTON_COPY')),
+			'paste'         => array('label' => JText::_('PLG_TINY_TOOLBAR_BUTTON_PASTE'), 'plugin' => 'paste'),
+			'pastetext'     => array('label' => JText::_('PLG_TINY_TOOLBAR_BUTTON_PASTETEXT'), 'plugin' => 'paste'),
+			'removeformat'  => array('label' => JText::_('PLG_TINY_TOOLBAR_BUTTON_REMOVEFORMAT')),
+
+			// Buttons from the plugins
+			'forecolor'      => array('label' => JText::_('PLG_TINY_TOOLBAR_BUTTON_FORECOLOR'), 'plugin' => 'textcolor'),
+			'backcolor'      => array('label' => JText::_('PLG_TINY_TOOLBAR_BUTTON_BACKCOLOR'), 'plugin' => 'textcolor'),
+			'anchor'         => array('label' => JText::_('PLG_TINY_TOOLBAR_BUTTON_ANCHOR'), 'plugin' => 'anchor'),
+			'hr'             => array('label' => JText::_('PLG_TINY_TOOLBAR_BUTTON_HR'), 'plugin' => 'hr'),
+			'ltr'            => array('label' => JText::_('PLG_TINY_TOOLBAR_BUTTON_LTR'), 'plugin' => 'directionality'),
+			'rtl'            => array('label' => JText::_('PLG_TINY_TOOLBAR_BUTTON_RTL'), 'plugin' => 'directionality'),
+			'code'           => array('label' => JText::_('PLG_TINY_TOOLBAR_BUTTON_CODE'), 'plugin' => 'code'),
+			'codesample'     => array('label' => JText::_('PLG_TINY_TOOLBAR_BUTTON_CODESAMPLE'), 'plugin' => 'codesample'),
+			'table'          => array('label' => JText::_('PLG_TINY_TOOLBAR_BUTTON_TABLE'), 'plugin' => 'table'),
+			'charmap'        => array('label' => JText::_('PLG_TINY_TOOLBAR_BUTTON_CHARMAP'), 'plugin' => 'charmap'),
+			'visualchars'    => array('label' => JText::_('PLG_TINY_TOOLBAR_BUTTON_VISUALCHARS'), 'plugin' => 'visualchars'),
+			'visualblocks'   => array('label' => JText::_('PLG_TINY_TOOLBAR_BUTTON_VISUALBLOCKS'), 'plugin' => 'visualblocks'),
+			'nonbreaking'    => array('label' => JText::_('PLG_TINY_TOOLBAR_BUTTON_NONBREAKING'), 'plugin' => 'nonbreaking'),
+			'emoticons'      => array('label' => JText::_('PLG_TINY_TOOLBAR_BUTTON_EMOTICONS'), 'plugin' => 'emoticons'),
+			'image'          => array('label' => JText::_('PLG_TINY_TOOLBAR_BUTTON_IMAGE'), 'plugin' => 'image'),
+			'media'          => array('label' => JText::_('PLG_TINY_TOOLBAR_BUTTON_MEDIA'), 'plugin' => 'media'),
+			'pagebreak'      => array('label' => JText::_('PLG_TINY_TOOLBAR_BUTTON_PAGEBREAK'), 'plugin' => 'pagebreak'),
+			'print'          => array('label' => JText::_('PLG_TINY_TOOLBAR_BUTTON_PRINT'), 'plugin' => 'print'),
+			'preview'        => array('label' => JText::_('PLG_TINY_TOOLBAR_BUTTON_PREVIEW'), 'plugin' => 'preview'),
+			'fullscreen'     => array('label' => JText::_('PLG_TINY_TOOLBAR_BUTTON_FULLSCREEN'), 'plugin' => 'fullscreen'),
+			'template'       => array('label' => JText::_('PLG_TINY_TOOLBAR_BUTTON_TEMPLATE'), 'plugin' => 'template'),
+			'searchreplace'  => array('label' => JText::_('PLG_TINY_TOOLBAR_BUTTON_SEARCHREPLACE'), 'plugin' => 'searchreplace'),
+			'insertdatetime' => array('label' => JText::_('PLG_TINY_TOOLBAR_BUTTON_INSERTDATETIME'), 'plugin' => 'insertdatetime'),
+			// 'spellchecker'   => array('label' => JText::_('PLG_TINY_TOOLBAR_BUTTON_SPELLCHECKER'), 'plugin' => 'spellchecker'),
+		);
+
+		return $buttons;
+	}
+
+	/**
+	 * Return toolbar presets
+	 *
+	 * @return array
+	 *
+	 * @since __DEPLOY_VERSION__
+	 */
+	public static function getToolbarPreset()
+	{
+		$preset = array();
+
+		$preset['simple'] = array(
+			'menu' => array(),
+			'toolbar1' => array(
+				'bold', 'underline', 'strikethrough', '|',
+				'undo', 'redo', '|',
+				'bullist', 'numlist', '|',
+				'pastetext'
+			),
+			'toolbar2' => array(),
+		);
+
+		$preset['medium'] = array(
+			'menu' => array('edit', 'insert', 'view', 'format', 'table', 'tools'),
+			'toolbar1' => array(
+				'bold', 'italic', 'underline', 'strikethrough', '|',
+				'alignleft', 'aligncenter', 'alignright', 'alignjustify', '|',
+				'formatselect', '|',
+				'bullist', 'numlist', '|',
+				'outdent', 'indent', '|',
+				'undo', 'redo', '|',
+				'link', 'unlink', 'anchor', 'code', '|',
+				'hr', 'table', '|',
+				'subscript', 'superscript', '|',
+				'charmap', 'pastetext' , 'preview'
+			),
+			'toolbar2' => array(),
+		);
+
+		$preset['advanced'] = array(
+			'menu'     => array('edit', 'insert', 'view', 'format', 'table', 'tools'),
+			'toolbar1' => array(
+				'bold', 'italic', 'underline', 'strikethrough', '|',
+				'alignleft', 'aligncenter', 'alignright', 'alignjustify', '|',
+				'styleselect', '|',
+				'formatselect', 'fontselect', 'fontsizeselect', '|',
+				'searchreplace', '|',
+				'bullist', 'numlist', '|',
+				'outdent', 'indent', '|',
+				'undo', 'redo', '|',
+				'link', 'unlink', 'anchor', 'image', '|',
+				'code', '|',
+				'forecolor', 'backcolor', '|',
+				'fullscreen', '|',
+				'table', '|',
+				'subscript', 'superscript', '|',
+				'charmap', 'emoticons', 'media', 'hr', 'ltr', 'rtl', '|',
+				'cut', 'copy', 'paste', 'pastetext', '|',
+				'visualchars', 'visualblocks', 'nonbreaking', 'blockquote', 'template', '|',
+				'print', 'preview', 'codesample', 'insertdatetime', 'removeformat',
+			),
+			'toolbar2' => array(),
+		);
+
+		return $preset;
+	}
 }
diff --git a/plugins/editors/tinymce/tinymce.xml b/plugins/editors/tinymce/tinymce.xml
index cdc671efcae42..0804990a63cb6 100644
--- a/plugins/editors/tinymce/tinymce.xml
+++ b/plugins/editors/tinymce/tinymce.xml
@@ -12,6 +12,7 @@
 	<files>
 		<filename plugin="tinymce">tinymce.php</filename>
 		<folder>fields</folder>
+		<folder>form</folder>
 	</files>
 	<media destination="editors" folder="media">
 		<folder>tinymce</folder>
@@ -22,213 +23,22 @@
 	</languages>
 	<config>
 		<fields name="params">
-			<fieldset name="basic">
-				<field
-					name="skins"
-					type="note"
-					label="PLG_TINY_FIELD_SKIN_INFO_LABEL"
-					description="PLG_TINY_FIELD_SKIN_INFO_DESC"
-				/>
-
-				<field
-					name="skin"
-					type="skins"
-					label="PLG_TINY_FIELD_SKIN_LABEL"
-					description="PLG_TINY_FIELD_SKIN_DESC"
-				/>
-
-				<field
-					name="skin_admin"
-					type="skins"
-					label="PLG_TINY_FIELD_SKIN_ADMIN_LABEL"
-					description="PLG_TINY_FIELD_SKIN_ADMIN_DESC"
-				/>
-
-				<field
-					name="mode"
-					type="list"
-					label="PLG_TINY_FIELD_FUNCTIONALITY_LABEL"
-					description="PLG_TINY_FIELD_FUNCTIONALITY_DESC"
-					default="2"
-					>
-					<option value="0">PLG_TINY_FIELD_VALUE_SIMPLE</option>
-					<option value="1">PLG_TINY_FIELD_VALUE_ADVANCED</option>
-					<option value="2">PLG_TINY_FIELD_VALUE_EXTENDED</option>
-				</field>
-
-				<field
-					name="mobile"
-					type="radio"
-					label="PLG_TINY_FIELD_MOBILE_LABEL"
-					description="PLG_TINY_FIELD_MOBILE_DESC"
-					class="btn-group btn-group-yesno"
-					default="0"
-					>
-					<option value="1">JON</option>
-					<option value="0">JOFF</option>
-				</field>
-
-				<field
-					name="drag_drop"
-					type="radio"
-					label="PLG_TINY_FIELD_DRAG_DROP_LABEL"
-					description="PLG_TINY_FIELD_DRAG_DROP_DESC"
-					class="btn-group btn-group-yesno"
-					default="1"
-					>
-					<option value="1">JON</option>
-					<option value="0">JOFF</option>
-				</field>
-
-				<field
-					name="path"
-					type="text"
-					label="PLG_TINY_FIELD_CUSTOM_PATH_LABEL"
-					description="PLG_TINY_FIELD_CUSTOM_PATH_DESC"
-					size="30"
-					showon="drag_drop:1"
-				/>
-
-				<field
-					name="entity_encoding"
-					type="list"
-					label="PLG_TINY_FIELD_ENCODING_LABEL"
-					description="PLG_TINY_FIELD_ENCODING_DESC"
-					default="raw"
-					>
-					<option value="named">PLG_TINY_FIELD_VALUE_NAMED</option>
-					<option value="numeric">PLG_TINY_FIELD_VALUE_NUMERIC</option>
-					<option value="raw">PLG_TINY_FIELD_VALUE_RAW</option>
-				</field>
-
-				<field
-					name="lang_mode"
-					type="radio"
-					label="PLG_TINY_FIELD_LANGSELECT_LABEL"
-					description="PLG_TINY_FIELD_LANGSELECT_DESC"
-					class="btn-group btn-group-yesno"
-					default="1"
-					>
-					<option value="1">JON</option>
-					<option value="0">JOFF</option>
-				</field>
-
-				<field
-					name="lang_code"
-					type="filelist"
-					label="PLG_TINY_FIELD_LANGCODE_LABEL"
-					description="PLG_TINY_FIELD_LANGCODE_DESC"
-					class="inputbox"
-					stripext="1"
-					directory="media/editors/tinymce/langs/"
-					hide_none="1"
-					default="en"
-					hide_default="1"
-					filter="\.js$"
-					size="10"
-					showon="lang_mode:0"
-					>
-					<option value="en">en</option>
-				</field>
-
-				<field
-					name="text_direction"
-					type="list"
-					label="PLG_TINY_FIELD_DIRECTION_LABEL"
-					description="PLG_TINY_FIELD_DIRECTION_DESC"
-					default="ltr"
-					>
-					<option value="ltr">PLG_TINY_FIELD_VALUE_LTR</option>
-					<option value="rtl">PLG_TINY_FIELD_VALUE_RTL</option>
-				</field>
-
-				<field
-					name="content_css"
-					type="radio"
-					label="PLG_TINY_FIELD_CSS_LABEL"
-					description="PLG_TINY_FIELD_CSS_DESC"
-					class="btn-group btn-group-yesno"
-					default="1"
-					>
-					<option value="1">JON</option>
-					<option value="0">JOFF</option>
-				</field>
-
-				<field
-					name="content_css_custom"
-					type="text"
-					label="PLG_TINY_FIELD_CUSTOM_CSS_LABEL"
-					description="PLG_TINY_FIELD_CUSTOM_CSS_DESC"
-					size="30"
-				/>
-
-				<field
-					name="relative_urls"
-					type="list"
-					label="PLG_TINY_FIELD_URLS_LABEL"
-					description="PLG_TINY_FIELD_URLS_DESC"
-					default="1"
-					>
-					<option value="0">PLG_TINY_FIELD_VALUE_ABSOLUTE</option>
-					<option value="1">PLG_TINY_FIELD_VALUE_RELATIVE</option>
-				</field>
-
-				<field
-					name="newlines"
-					type="list"
-					label="PLG_TINY_FIELD_NEWLINES_LABEL"
-					description="PLG_TINY_FIELD_NEWLINES_DESC"
-					default="0"
-					>
-					<option value="1">PLG_TINY_FIELD_VALUE_BR</option>
-					<option value="0">PLG_TINY_FIELD_VALUE_P</option>
-				</field>
-
-				<field
-					name="use_config_textfilters"
-					type="radio"
-					label="PLG_TINY_CONFIG_TEXTFILTER_ACL_LABEL"
-					description="PLG_TINY_CONFIG_TEXTFILTER_ACL_DESC"
-					class="btn-group btn-group-yesno"
-					default="0"
-					>
-					<option value="1">JON</option>
-					<option value="0">JOFF</option>
-				</field>
-
-				<field
-					name="invalid_elements"
-					type="textarea"
-					label="PLG_TINY_FIELD_PROHIBITED_LABEL"
-					description="PLG_TINY_FIELD_PROHIBITED_DESC"
-					showon="use_config_textfilters:0"
-					default="script,applet,iframe"
-					cols="30"
-					rows="2"
-				/>
-
-				<field
-					name="valid_elements"
-					type="textarea"
-					label="PLG_TINY_FIELD_VALIDELEMENTS_LABEL"
-					description="PLG_TINY_FIELD_VALIDELEMENTS_DESC"
-					showon="use_config_textfilters:0"
-					cols="30"
-					rows="2"
-				/>
 
-				<field
-					name="extended_elements"
-					type="textarea"
-					label="PLG_TINY_FIELD_ELEMENTS_LABEL"
-					description="PLG_TINY_FIELD_ELEMENTS_DESC"
-					showon="use_config_textfilters:0"
-					cols="30"
-					rows="2"
-				/>
+			<fieldset name="basic">
+				<field name="configuration" type="tinymcebuilder" hiddenLabel="true" />
 			</fieldset>
 
 			<fieldset name="advanced" label="PLG_TINY_FIELD_LABEL_ADVANCEDPARAMS">
+				<field
+					name="sets_amount"
+					type="number"
+					filter="int"
+					validate="number"
+					min="3"
+					label="PLG_TINY_FIELD_NUMBER_OF_SETS_LABEL"
+					description="PLG_TINY_FIELD_NUMBER_OF_SETS_DESC"
+					default="3"
+				/>
 				<field
 					name="html_height"
 					type="text"
@@ -244,324 +54,6 @@
 					description="PLG_TINY_FIELD_HTMLWIDTH_DESC"
 					default=""
 				/>
-
-				<field
-					name="resizing"
-					type="radio"
-					label="PLG_TINY_FIELD_RESIZING_LABEL"
-					description="PLG_TINY_FIELD_RESIZING_DESC"
-					class="btn-group btn-group-yesno"
-					default="1"
-					>
-					<option value="1">JON</option>
-					<option value="0">JOFF</option>
-				</field>
-
-				<field
-					name="resize_horizontal"
-					type="radio"
-					label="PLG_TINY_FIELD_RESIZE_HORIZONTAL_LABEL"
-					description="PLG_TINY_FIELD_RESIZE_HORIZONTAL_DESC"
-					class="btn-group btn-group-yesno"
-					default="1"
-					showon="resizing:1"
-					>
-					<option value="1">JON</option>
-					<option value="0">JOFF</option>
-				</field>
-
-				<field
-					name="element_path"
-					type="radio"
-					label="PLG_TINY_FIELD_PATH_LABEL"
-					description="PLG_TINY_FIELD_PATH_DESC"
-					class="btn-group btn-group-yesno"
-					default="1"
-					>
-					<option value="1">JON</option>
-					<option value="0">JOFF</option>
-				</field>
-
-				<field
-					name="spacer"
-					type="spacer"
-					label="PLG_TINY_FIELD_NAME_EXTENDED_LABEL"
-					class="text"
-				/>
-
-				<field
-					name="fonts"
-					type="accesslevel"
-					label="PLG_TINY_FIELD_FONTS_LABEL"
-					description="PLG_TINY_FIELD_FONTS_DESC"
-					default="1"
-					>
-					<option value="0">JHIDE</option>
-				</field>
-
-				<field
-					name="paste"
-					type="accesslevel"
-					label="PLG_TINY_FIELD_PASTE_LABEL"
-					description="PLG_TINY_FIELD_PASTE_DESC"
-					default="1"
-					>
-					<option value="0">JHIDE</option>
-				</field>
-
-				<field
-					name="searchreplace"
-					type="accesslevel"
-					label="PLG_TINY_FIELD_SEARCH-REPLACE_LABEL"
-					description="PLG_TINY_FIELD_SEARCH-REPLACE_DESC"
-					default="1"
-					>
-					<option value="0">JHIDE</option>
-				</field>
-
-				<field
-					name="insertdate"
-					type="accesslevel"
-					label="PLG_TINY_FIELD_DATE_LABEL"
-					description="PLG_TINY_FIELD_DATE_DESC"
-					default="1"
-					>
-					<option value="0">JHIDE</option>
-				</field>
-
-				<field
-					name="colors"
-					type="accesslevel"
-					label="PLG_TINY_FIELD_COLORS_LABEL"
-					description="PLG_TINY_FIELD_COLORS_DESC"
-					default="1"
-					>
-					<option value="0">JHIDE</option>
-				</field>
-
-				<field
-					name="table"
-					type="accesslevel"
-					label="PLG_TINY_FIELD_TABLE_LABEL"
-					description="PLG_TINY_FIELD_TABLE_DESC"
-					default="1"
-					>
-					<option value="0">JHIDE</option>
-				</field>
-
-				<field
-					name="smilies"
-					type="accesslevel"
-					label="PLG_TINY_FIELD_SMILIES_LABEL"
-					description="PLG_TINY_FIELD_SMILIES_DESC"
-					default="1"
-					>
-					<option value="0">JHIDE</option>
-				</field>
-
-				<field
-					name="hr"
-					type="accesslevel"
-					label="PLG_TINY_FIELD_HR_LABEL"
-					description="PLG_TINY_FIELD_HR_DESC"
-					default="1"
-					>
-					<option value="0">JHIDE</option>
-				</field>
-
-				<field
-					name="link"
-					type="accesslevel"
-					label="PLG_TINY_FIELD_LINK_LABEL"
-					description="PLG_TINY_FIELD_LINK_DESC"
-					default="1"
-					>
-					<option value="0">JHIDE</option>
-				</field>
-
-				<field
-					name="media"
-					type="accesslevel"
-					label="PLG_TINY_FIELD_MEDIA_LABEL"
-					description="PLG_TINY_FIELD_MEDIA_DESC"
-					default="1"
-					>
-					<option value="0">JHIDE</option>
-				</field>
-
-				<field
-					name="print"
-					type="accesslevel"
-					label="PLG_TINY_FIELD_PRINT_LABEL"
-					description="PLG_TINY_FIELD_PRINT_DESC"
-					default="1"
-					>
-					<option value="0">JHIDE</option>
-				</field>
-
-				<field
-					name="directionality"
-					type="accesslevel"
-					label="PLG_TINY_FIELD_RTL_LABEL"
-					description="PLG_TINY_FIELD_RTL_DESC"
-					default="1"
-					>
-					<option value="0">JHIDE</option>
-				</field>
-
-				<field
-					name="fullscreen"
-					type="accesslevel"
-					label="PLG_TINY_FIELD_FULLSCREEN_LABEL"
-					description="PLG_TINY_FIELD_FULLSCREEN_DESC"
-					default="1"
-					>
-					<option value="0">JHIDE</option>
-				</field>
-
-				<field
-					name="alignment"
-					type="accesslevel"
-					label="PLG_TINY_FIELD_ALIGN_LABEL"
-					description="PLG_TINY_FIELD_ALIGN_DESC"
-					default="1"
-					>
-					<option value="0">JHIDE</option>
-				</field>
-
-				<field
-					name="visualchars"
-					type="accesslevel"
-					label="PLG_TINY_FIELD_VISUALCHARS_LABEL"
-					description="PLG_TINY_FIELD_VISUALCHARS_DESC"
-					default="1"
-					>
-					<option value="0">JHIDE</option>
-				</field>
-
-				<field
-					name="visualblocks"
-					type="accesslevel"
-					label="PLG_TINY_FIELD_VISUALBLOCKS_LABEL"
-					description="PLG_TINY_FIELD_VISUALBLOCKS_DESC"
-					default="1"
-					>
-					<option value="0">JHIDE</option>
-				</field>
-
-				<field
-					name="nonbreaking"
-					type="accesslevel"
-					label="PLG_TINY_FIELD_NONBREAKING_LABEL"
-					description="PLG_TINY_FIELD_NONBREAKING_DESC"
-					default="1"
-					>
-					<option value="0">JHIDE</option>
-				</field>
-
-				<field
-					name="template"
-					type="accesslevel"
-					label="PLG_TINY_FIELD_TEMPLATE_LABEL"
-					description="PLG_TINY_FIELD_TEMPLATE_DESC"
-					default="1"
-					>
-					<option value="0">JHIDE</option>
-				</field>
-
-				<field
-					name="blockquote"
-					type="accesslevel"
-					label="PLG_TINY_FIELD_BLOCKQUOTE_LABEL"
-					description="PLG_TINY_FIELD_BLOCKQUOTE_DESC"
-					default="1"
-				>
-					<option value="0">JOFF</option>
-				</field>
-
-				<field
-					name="wordcount"
-					type="accesslevel"
-					label="PLG_TINY_FIELD_WORDCOUNT_LABEL"
-					description="PLG_TINY_FIELD_WORDCOUNT_DESC"
-					default="1"
-					>
-					<option value="0">JOFF</option>
-				</field>
-
-				<field
-					name="image_advtab"
-					type="accesslevel"
-					label="PLG_TINY_FIELD_ADVIMAGE_LABEL"
-					description="PLG_TINY_FIELD_ADVIMAGE_DESC"
-					default="1"
-					>
-					<option value="0">JOFF</option>
-				</field>
-
-				<field
-					name="code_sample"
-					type="accesslevel"
-					label="PLG_TINY_FIELD_CODESAMPLE_LABEL"
-					description="PLG_TINY_FIELD_CODESAMPLE_DESC"
-					default="1"
-					>
-					<option value="0">JOFF</option>
-				</field>
-
-				<field
-					name="advlist"
-					type="accesslevel"
-					label="PLG_TINY_FIELD_ADVLIST_LABEL"
-					description="PLG_TINY_FIELD_ADVLIST_DESC"
-					default="1"
-					>
-					<option value="0">JOFF</option>
-				</field>
-
-				<field
-					name="autosave"
-					type="accesslevel"
-					label="PLG_TINY_FIELD_SAVEWARNING_LABEL"
-					description="PLG_TINY_FIELD_SAVEWARNING_DESC"
-					default="1"
-					>
-					<option value="0">JOFF</option>
-				</field>
-
-				<field
-					name="contextmenu"
-					type="accesslevel"
-					label="PLG_TINY_FIELD_CONTEXTMENU_LABEL"
-					description="PLG_TINY_FIELD_CONTEXTMENU_DESC"
-					default="1"
-					>
-					<option value="0">JOFF</option>
-				</field>
-
-				<field
-					name="inlinepopups"
-					type="accesslevel"
-					label="PLG_TINY_FIELD_INLINEPOPUPS_LABEL"
-					description="PLG_TINY_FIELD_INLINEPOPUPS_DESC"
-					default="1"
-					>
-					<option value="0">JOFF</option>
-				</field>
-
-				<field
-					name="custom_plugin"
-					type="text"
-					label="PLG_TINY_FIELD_CUSTOMPLUGIN_LABEL"
-					description="PLG_TINY_FIELD_CUSTOMPLUGIN_DESC"
-				/>
-
-				<field
-					name="custom_button"
-					type="text"
-					label="PLG_TINY_FIELD_CUSTOMBUTTON_LABEL"
-					description="PLG_TINY_FIELD_CUSTOMBUTTON_DESC"
-				/>
 			</fieldset>
 		</fields>
 	</config>

From ec9a78ab4ef6d8bdbccc0dd93124075dd61f8f60 Mon Sep 17 00:00:00 2001
From: Jelle Kok <schumacher1986@hotmail.com>
Date: Tue, 6 Dec 2016 22:51:13 +0100
Subject: [PATCH 04/39] PHP 7.1 Notice: A non well formed numeric value
 encountered #12310 (#12311)

* PHP 7.1 Notice: A non well formed numeric value encountered #12310

* Update code
---
 .../com_installer/models/warnings.php         | 28 ++++++++++++++++---
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/administrator/components/com_installer/models/warnings.php b/administrator/components/com_installer/models/warnings.php
index 2e598226b11b9..76e2ffba2bbd7 100644
--- a/administrator/components/com_installer/models/warnings.php
+++ b/administrator/components/com_installer/models/warnings.php
@@ -33,21 +33,41 @@ class InstallerModelWarnings extends JModelList
 	 */
 	public function return_bytes($val)
 	{
+		if (empty($val))
+		{
+			return 0;
+		}
+
 		$val = trim($val);
-		$last = strtolower($val{strlen($val) - 1});
 
-		switch ($last)
+		preg_match('#([0-9]+)[\s]*([a-z]+)#i', $val, $matches);
+
+		$last = '';
+
+		if (isset($matches[2]))
+		{
+			$last = $matches[2];
+		}
+
+		if (isset($matches[1]))
+		{
+			$val = (int) $matches[1];
+		}
+
+		switch (strtolower($last))
 		{
-			// The 'G' modifier is available since PHP 5.1.0
 			case 'g':
+			case 'gb':
 				$val *= 1024;
 			case 'm':
+			case 'mb':
 				$val *= 1024;
 			case 'k':
+			case 'kb':
 				$val *= 1024;
 		}
 
-		return $val;
+		return (int) $val;
 	}
 
 	/**

From 7eef1fda707d111dcd313cb6563d4af6b3fd2889 Mon Sep 17 00:00:00 2001
From: Nicola Galgano <optimus4joomla@gmail.com>
Date: Tue, 6 Dec 2016 22:52:29 +0100
Subject: [PATCH 05/39] [com_finder] - remove reference to panthom table
 #__finder_links_terms (#12347)

* remove panthom table #__finder_links_terms

remove panthom table #__finder_links_terms and the unused metho getTermsQuery()

* remove optimize for panthom table #__finder_links_terms

remove optimize for panthom table #__finder_links_terms

* optimize missed tables

#__finder_filters
#__finder_taxonomy
#__finder_terms_common
#__finder_types
---
 .../helpers/indexer/driver/mysql.php          | 16 +++++++++++--
 components/com_finder/models/search.php       | 23 -------------------
 2 files changed, 14 insertions(+), 25 deletions(-)

diff --git a/administrator/components/com_finder/helpers/indexer/driver/mysql.php b/administrator/components/com_finder/helpers/indexer/driver/mysql.php
index 5e7f150c098d8..a2b4577877c02 100644
--- a/administrator/components/com_finder/helpers/indexer/driver/mysql.php
+++ b/administrator/components/com_finder/helpers/indexer/driver/mysql.php
@@ -538,8 +538,16 @@ public function optimize()
 			$db->execute();
 		}
 
-		// Optimize the terms mapping table.
-		$db->setQuery('OPTIMIZE TABLE ' . $db->quoteName('#__finder_links_terms'));
+		// Optimize the filters table.
+		$db->setQuery('OPTIMIZE TABLE ' . $db->quoteName('#__finder_filters'));
+		$db->execute();
+
+		// Optimize the terms common table.
+		$db->setQuery('OPTIMIZE TABLE ' . $db->quoteName('#__finder_terms_common'));
+		$db->execute();
+
+		// Optimize the types table.
+		$db->setQuery('OPTIMIZE TABLE ' . $db->quoteName('#__finder_types'));
 		$db->execute();
 
 		// Remove the orphaned taxonomy nodes.
@@ -549,6 +557,10 @@ public function optimize()
 		$db->setQuery('OPTIMIZE TABLE ' . $db->quoteName('#__finder_taxonomy_map'));
 		$db->execute();
 
+		// Optimize the taxonomy table.
+		$db->setQuery('OPTIMIZE TABLE ' . $db->quoteName('#__finder_taxonomy'));
+		$db->execute();
+
 		return true;
 	}
 
diff --git a/components/com_finder/models/search.php b/components/com_finder/models/search.php
index 4d1ad66d611d6..aa9c0273ac0fc 100644
--- a/components/com_finder/models/search.php
+++ b/components/com_finder/models/search.php
@@ -990,29 +990,6 @@ protected function getExcludedLinkIds()
 		return $links;
 	}
 
-	/**
-	 * Method to get a subquery for filtering link ids mapped to specific
-	 * terms ids.
-	 *
-	 * @param   array  $terms  An array of search term ids.
-	 *
-	 * @return  JDatabaseQuery  A database object.
-	 *
-	 * @since   2.5
-	 */
-	protected function getTermsQuery($terms)
-	{
-		// Create the SQL query to get the matching link ids.
-		// TODO: Impact of removing SQL_NO_CACHE?
-		$db = $this->getDbo();
-		$query = $db->getQuery(true)
-			->select('SQL_NO_CACHE link_id')
-			->from('#__finder_links_terms')
-			->where('term_id IN (' . implode(',', $terms) . ')');
-
-		return $query;
-	}
-
 	/**
 	 * Method to get a store id based on model the configuration state.
 	 *

From 20d5ddd6a682e6c29dd19e27d7cd4f05f7f2b38c Mon Sep 17 00:00:00 2001
From: Brian Teeman <brian@teeman.net>
Date: Tue, 6 Dec 2016 21:54:24 +0000
Subject: [PATCH 06/39] Add full_image layout (#12421)

---
 .../views/article/tmpl/default.php            |  9 +-------
 layouts/joomla/content/full_image.php         | 21 +++++++++++++++++++
 2 files changed, 22 insertions(+), 8 deletions(-)
 create mode 100644 layouts/joomla/content/full_image.php

diff --git a/components/com_content/views/article/tmpl/default.php b/components/com_content/views/article/tmpl/default.php
index 006bff23ac464..4274523b85485 100644
--- a/components/com_content/views/article/tmpl/default.php
+++ b/components/com_content/views/article/tmpl/default.php
@@ -97,14 +97,7 @@
 	<?php echo $this->loadTemplate('links'); ?>
 	<?php endif; ?>
 	<?php if ($params->get('access-view')):?>
-	<?php if (isset($images->image_fulltext) && !empty($images->image_fulltext)) : ?>
-	<?php $imgfloat = (empty($images->float_fulltext)) ? $params->get('float_fulltext') : $images->float_fulltext; ?>
-	<div class="pull-<?php echo htmlspecialchars($imgfloat); ?> item-image"> <img
-	<?php if ($images->image_fulltext_caption):
-		echo 'class="caption"' . ' title="' . htmlspecialchars($images->image_fulltext_caption) . '"';
-	endif; ?>
-	src="<?php echo htmlspecialchars($images->image_fulltext); ?>" alt="<?php echo htmlspecialchars($images->image_fulltext_alt); ?>" itemprop="image"/> </div>
-	<?php endif; ?>
+	<?php echo JLayoutHelper::render('joomla.content.full_image', $this->item); ?>
 	<?php
 	if (!empty($this->item->pagination) && $this->item->pagination && !$this->item->paginationposition && !$this->item->paginationrelative):
 		echo $this->item->pagination;
diff --git a/layouts/joomla/content/full_image.php b/layouts/joomla/content/full_image.php
new file mode 100644
index 0000000000000..d02867fd95d53
--- /dev/null
+++ b/layouts/joomla/content/full_image.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+$params = $displayData->params;
+?>
+<?php $images = json_decode($displayData->images); ?>
+	<?php if (isset($images->image_fulltext) && !empty($images->image_fulltext)) : ?>
+		<?php $imgfloat = (empty($images->float_fulltext)) ? $params->get('float_fulltext') : $images->float_fulltext; ?>
+		<div class="pull-<?php echo htmlspecialchars($imgfloat); ?> item-image"> <img
+		<?php if ($images->image_fulltext_caption):
+			echo 'class="caption"' . ' title="' . htmlspecialchars($images->image_fulltext_caption) . '"';
+		endif; ?>
+		src="<?php echo htmlspecialchars($images->image_fulltext); ?>" alt="<?php echo htmlspecialchars($images->image_fulltext_alt); ?>" itemprop="image"/> </div>
+	<?php endif; ?>
\ No newline at end of file

From 9aa272fd971278bd9fc2ea94d414cb075a03a519 Mon Sep 17 00:00:00 2001
From: Izhar Aazmi <izharaazmi@gmail.com>
Date: Wed, 7 Dec 2016 03:25:15 +0530
Subject: [PATCH 07/39] Ajax list limit issue in menu manager edit form
 (#12510)

The list limit of default 20 was being forced on ajax request for parent items in menu edit form. Now this should load all items.
---
 administrator/components/com_menus/controllers/item.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/administrator/components/com_menus/controllers/item.php b/administrator/components/com_menus/controllers/item.php
index 36c95367c706c..5fd6210a04006 100644
--- a/administrator/components/com_menus/controllers/item.php
+++ b/administrator/components/com_menus/controllers/item.php
@@ -535,8 +535,11 @@ public function getParentItem()
 		$menutype = $this->input->get->get('menutype');
 
 		$model = $this->getModel('Items', '', array());
+		$model->getState();
 		$model->setState('filter.menutype', $menutype);
 		$model->setState('list.select', 'a.id, a.title, a.level');
+		$model->setState('list.start', 0);
+		$model->setState('list.limit', 0);
 
 		$results = $model->getItems();
 

From 846ba67325372c0cdc9cd16d78d38f41f1fe9b5a Mon Sep 17 00:00:00 2001
From: Chris Davenport <chris.davenport@davenporttechnology.com>
Date: Tue, 6 Dec 2016 21:55:43 +0000
Subject: [PATCH 08/39] [Smart Search] Add peak memory usage to CLI indexer
 (#12679)

---
 cli/finder_indexer.php              | 1 +
 language/en-GB/en-GB.finder_cli.ini | 1 +
 2 files changed, 2 insertions(+)

diff --git a/cli/finder_indexer.php b/cli/finder_indexer.php
index d7bb1c39e08d8..25e16c2792f78 100644
--- a/cli/finder_indexer.php
+++ b/cli/finder_indexer.php
@@ -142,6 +142,7 @@ public function doExecute()
 
 		// Total reporting.
 		$this->out(JText::sprintf('FINDER_CLI_PROCESS_COMPLETE', round(microtime(true) - $this->time, 3)), true);
+		$this->out(JText::sprintf('FINDER_CLI_PEAK_MEMORY_USAGE', number_format(memory_get_peak_usage(true))));
 
 		// Print a blank line at the end.
 		$this->out();
diff --git a/language/en-GB/en-GB.finder_cli.ini b/language/en-GB/en-GB.finder_cli.ini
index 6af1dd0b0bd97..308e25613331f 100644
--- a/language/en-GB/en-GB.finder_cli.ini
+++ b/language/en-GB/en-GB.finder_cli.ini
@@ -9,6 +9,7 @@ FINDER_CLI_FILTER_RESTORE_WARNING="Warning: Did not find taxonomy %s/%s in filte
 FINDER_CLI_INDEX_PURGE="Clear index"
 FINDER_CLI_INDEX_PURGE_FAILED="- index clear failed."
 FINDER_CLI_INDEX_PURGE_SUCCESS="- index clear successful"
+FINDER_CLI_PEAK_MEMORY_USAGE="Peak memory usage: %s bytes"
 FINDER_CLI_PROCESS_COMPLETE="Total Processing Time: %s seconds."
 FINDER_CLI_RESTORE_FILTER_COMPLETED="- number of filters restored: %s"
 FINDER_CLI_RESTORE_FILTERS="Restoring filters"

From f8a1f5d50e543f8a2628a8dddc611f47cf5bffa5 Mon Sep 17 00:00:00 2001
From: andrepereiradasilva <andrepereiradasilva@users.noreply.github.com>
Date: Tue, 6 Dec 2016 21:58:22 +0000
Subject: [PATCH 09/39] Make JLanguageHelper::getInstalledLanguages add log
 message when language xml files doesn't exist (or is not readable) (#12783)

* fail silently

* add log messages

* add to language file

* add to admin language file

* log to language category instead
---
 .../language/en-GB/en-GB.lib_joomla.ini       |  3 ++
 language/en-GB/en-GB.lib_joomla.ini           |  3 ++
 libraries/joomla/language/helper.php          | 32 ++++++++++++++++---
 3 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/administrator/language/en-GB/en-GB.lib_joomla.ini b/administrator/language/en-GB/en-GB.lib_joomla.ini
index f2dcf0c1be4d6..d61339ae76cb1 100644
--- a/administrator/language/en-GB/en-GB.lib_joomla.ini
+++ b/administrator/language/en-GB/en-GB.lib_joomla.ini
@@ -701,6 +701,9 @@ JLIB_JS_AJAX_ERROR_OTHER="An error has occurred while fetching the JSON data: HT
 JLIB_JS_AJAX_ERROR_PARSE="A parse error has occurred while processing the following JSON data:<br/><code style="_QQ_"color:inherit;white-space:pre-wrap;padding:0;margin:0;border:0;background:inherit;"_QQ_">%s</code>"
 JLIB_JS_AJAX_ERROR_TIMEOUT="A timeout has occurred while fetching the JSON data."
 
+JLIB_LANGUAGE_ERROR_CANNOT_LOAD_METAFILE="Could not load %s language XML file from %s."
+JLIB_LANGUAGE_ERROR_CANNOT_LOAD_METADATA="Could not load %s metadata from %s."
+
 JLIB_MAIL_FUNCTION_DISABLED="The mail() function has been disabled and the mail can't be sent."
 JLIB_MAIL_FUNCTION_OFFLINE="The mail function has been disabled by an administrator."
 JLIB_MAIL_INVALID_EMAIL_SENDER="JMail: : Invalid email Sender: %s, JMail: :setSender(%s)."
diff --git a/language/en-GB/en-GB.lib_joomla.ini b/language/en-GB/en-GB.lib_joomla.ini
index 88ffbc1510bb5..d44dd4bf496e5 100644
--- a/language/en-GB/en-GB.lib_joomla.ini
+++ b/language/en-GB/en-GB.lib_joomla.ini
@@ -701,6 +701,9 @@ JLIB_JS_AJAX_ERROR_OTHER="An error has occurred while fetching the JSON data: HT
 JLIB_JS_AJAX_ERROR_PARSE="A parse error has occurred while processing the following JSON data:<br/><code style="_QQ_"color:inherit;white-space:pre-wrap;padding:0;margin:0;border:0;background:inherit;"_QQ_">%s</code>"
 JLIB_JS_AJAX_ERROR_TIMEOUT="A timeout has occurred while fetching the JSON data."
 
+JLIB_LANGUAGE_ERROR_CANNOT_LOAD_METAFILE="Could not load %s language XML file from %s."
+JLIB_LANGUAGE_ERROR_CANNOT_LOAD_METADATA="Could not load %s metadata from %s."
+
 JLIB_MAIL_FUNCTION_DISABLED="The mail() function has been disabled and the mail can't be sent."
 JLIB_MAIL_FUNCTION_OFFLINE="The mail function has been disabled by an administrator."
 JLIB_MAIL_INVALID_EMAIL_SENDER="JMail: : Invalid email Sender: %s, JMail: :setSender(%s)."
diff --git a/libraries/joomla/language/helper.php b/libraries/joomla/language/helper.php
index ede1cc82a5295..05c58dc3c3278 100644
--- a/libraries/joomla/language/helper.php
+++ b/libraries/joomla/language/helper.php
@@ -226,11 +226,23 @@ public static function getInstalledLanguages($clientId = null, $processMetaData
 				// Process the language metadata.
 				if ($processMetaData)
 				{
-					$lang->metadata = JLanguage::parseXMLLanguageFile($metafile);
+					try
+					{
+						$lang->metadata = JLanguage::parseXMLLanguageFile($metafile);
+					}
+					// Not able to process xml language file. Fail silently.
+					catch (Exception $e)
+					{
+						JLog::add(JText::sprintf('JLIB_LANGUAGE_ERROR_CANNOT_LOAD_METAFILE', $language->element, $metafile), JLog::WARNING, 'language');
 
-					// No metadata found, not a valid language.
+						continue;
+					}
+
+					// No metadata found, not a valid language. Fail silently.
 					if (!is_array($lang->metadata))
 					{
+						JLog::add(JText::sprintf('JLIB_LANGUAGE_ERROR_CANNOT_LOAD_METADATA', $language->element, $metafile), JLog::WARNING, 'language');
+
 						continue;
 					}
 				}
@@ -238,11 +250,23 @@ public static function getInstalledLanguages($clientId = null, $processMetaData
 				// Process the language manifest.
 				if ($processManifest)
 				{
-					$lang->manifest = JInstaller::parseXMLInstallFile($metafile);
+					try
+					{
+						$lang->manifest = JInstaller::parseXMLInstallFile($metafile);
+					}
+					// Not able to process xml language file. Fail silently.
+					catch (Exception $e)
+					{
+						JLog::add(JText::sprintf('JLIB_LANGUAGE_ERROR_CANNOT_LOAD_METAFILE', $language->element, $metafile), JLog::WARNING, 'language');
 
-					// No metadata found, not a valid language.
+						continue;
+					}
+
+					// No metadata found, not a valid language. Fail silently.
 					if (!is_array($lang->manifest))
 					{
+						JLog::add(JText::sprintf('JLIB_LANGUAGE_ERROR_CANNOT_LOAD_METADATA', $language->element, $metafile), JLog::WARNING, 'language');
+
 						continue;
 					}
 				}

From 0be0f9e41b64376707bb2056eeaa858d60cf3bd9 Mon Sep 17 00:00:00 2001
From: Thomas Hunziker <werbemails@bakual.ch>
Date: Tue, 6 Dec 2016 22:59:48 +0100
Subject: [PATCH 10/39] [com_fields] Allow zero as value in fields (#12807)

* Allow zero as value in com_fields list fields

* All fields are affected, not only lists
---
 administrator/components/com_fields/helpers/fields.php    | 8 ++++----
 components/com_fields/layouts/field/prepare/base.php      | 2 +-
 .../com_fields/layouts/field/prepare/checkboxes.php       | 4 ++--
 components/com_fields/layouts/field/prepare/editor.php    | 2 +-
 components/com_fields/layouts/field/prepare/imagelist.php | 2 +-
 components/com_fields/layouts/field/prepare/list.php      | 4 ++--
 components/com_fields/layouts/field/prepare/media.php     | 2 +-
 components/com_fields/layouts/field/prepare/radio.php     | 4 ++--
 components/com_fields/layouts/field/prepare/sql.php       | 2 +-
 components/com_fields/layouts/field/prepare/textarea.php  | 2 +-
 components/com_fields/layouts/field/prepare/url.php       | 2 +-
 components/com_fields/layouts/field/prepare/user.php      | 2 +-
 .../com_fields/layouts/field/prepare/usergrouplist.php    | 2 +-
 components/com_fields/layouts/field/render.php            | 2 +-
 components/com_fields/layouts/fields/render.php           | 4 ++--
 15 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/administrator/components/com_fields/helpers/fields.php b/administrator/components/com_fields/helpers/fields.php
index c84cdfbcf04fd..21e74239cdbd4 100644
--- a/administrator/components/com_fields/helpers/fields.php
+++ b/administrator/components/com_fields/helpers/fields.php
@@ -134,7 +134,7 @@ public static function getFields($context, $item = null, $prepareValue = false,
 					$field->value = self::$fieldCache->getFieldValue($field->id, $field->context, $item->id);
 				}
 
-				if (! $field->value)
+				if ($field->value == '')
 				{
 					$field->value = $field->default_value;
 				}
@@ -192,7 +192,7 @@ public static function getFields($context, $item = null, $prepareValue = false,
 	 */
 	public static function render($context, $layoutFile, $displayData)
 	{
-		$value = null;
+		$value = '';
 
 		/*
 		 * Because the layout refreshes the paths before the render function is
@@ -207,13 +207,13 @@ public static function render($context, $layoutFile, $displayData)
 			$value = JLayoutHelper::render($layoutFile, $displayData, null, array('component' => $parts[0], 'client' => 0));
 		}
 
-		if (!$value)
+		if ($value == '')
 		{
 			// Trying to render the layout on Fields itself
 			$value = JLayoutHelper::render($layoutFile, $displayData, null, array('component' => 'com_fields','client' => 0));
 		}
 
-		if (!$value)
+		if ($value == '')
 		{
 			// Trying to render the layout of the plugins
 			foreach (JFolder::listFolderTree(JPATH_PLUGINS . '/fields', '.', 1) as $folder)
diff --git a/components/com_fields/layouts/field/prepare/base.php b/components/com_fields/layouts/field/prepare/base.php
index 6af8b844a2d0c..f9ffb7a0bd394 100644
--- a/components/com_fields/layouts/field/prepare/base.php
+++ b/components/com_fields/layouts/field/prepare/base.php
@@ -16,7 +16,7 @@
 $field = $displayData['field'];
 $value = $field->value;
 
-if (!$value)
+if ($value == '')
 {
 	return;
 }
diff --git a/components/com_fields/layouts/field/prepare/checkboxes.php b/components/com_fields/layouts/field/prepare/checkboxes.php
index 7558dfac2461b..5ed9d2f845708 100644
--- a/components/com_fields/layouts/field/prepare/checkboxes.php
+++ b/components/com_fields/layouts/field/prepare/checkboxes.php
@@ -16,7 +16,7 @@
 $field = $displayData['field'];
 $value = $field->value;
 
-if (!$value)
+if ($value == '')
 {
 	return;
 }
@@ -27,7 +27,7 @@
 
 foreach ($options as $optionValue => $optionText)
 {
-	if (in_array($optionValue, $value))
+	if (in_array((string) $optionValue, $value))
 	{
 		$texts[] = JText::_($optionText);
 	}
diff --git a/components/com_fields/layouts/field/prepare/editor.php b/components/com_fields/layouts/field/prepare/editor.php
index 5a68253c2a72c..5d2ac08810713 100644
--- a/components/com_fields/layouts/field/prepare/editor.php
+++ b/components/com_fields/layouts/field/prepare/editor.php
@@ -16,7 +16,7 @@
 $field = $displayData['field'];
 $value = $field->value;
 
-if (!$value)
+if ($value == '')
 {
 	return;
 }
diff --git a/components/com_fields/layouts/field/prepare/imagelist.php b/components/com_fields/layouts/field/prepare/imagelist.php
index 85dec1cd10c15..b1a0c659e01f4 100644
--- a/components/com_fields/layouts/field/prepare/imagelist.php
+++ b/components/com_fields/layouts/field/prepare/imagelist.php
@@ -16,7 +16,7 @@
 $field = $displayData['field'];
 $value = $field->value;
 
-if (!$value)
+if ($value == '')
 {
 	return;
 }
diff --git a/components/com_fields/layouts/field/prepare/list.php b/components/com_fields/layouts/field/prepare/list.php
index bf76d56e950a6..77050cee07b0e 100644
--- a/components/com_fields/layouts/field/prepare/list.php
+++ b/components/com_fields/layouts/field/prepare/list.php
@@ -16,7 +16,7 @@
 $field = $displayData['field'];
 $value = $field->value;
 
-if (!$value)
+if ($value == '')
 {
 	return;
 }
@@ -27,7 +27,7 @@
 
 foreach ($options as $optionValue => $optionText)
 {
-	if (in_array($optionValue, $value))
+	if (in_array((string) $optionValue, $value))
 	{
 		$texts[] = JText::_($optionText);
 	}
diff --git a/components/com_fields/layouts/field/prepare/media.php b/components/com_fields/layouts/field/prepare/media.php
index a758a21f653f2..1c1fc63cfb459 100644
--- a/components/com_fields/layouts/field/prepare/media.php
+++ b/components/com_fields/layouts/field/prepare/media.php
@@ -16,7 +16,7 @@
 $field = $displayData['field'];
 $value = $field->value;
 
-if (!$value)
+if ($value == '')
 {
 	return;
 }
diff --git a/components/com_fields/layouts/field/prepare/radio.php b/components/com_fields/layouts/field/prepare/radio.php
index bf76d56e950a6..77050cee07b0e 100644
--- a/components/com_fields/layouts/field/prepare/radio.php
+++ b/components/com_fields/layouts/field/prepare/radio.php
@@ -16,7 +16,7 @@
 $field = $displayData['field'];
 $value = $field->value;
 
-if (!$value)
+if ($value == '')
 {
 	return;
 }
@@ -27,7 +27,7 @@
 
 foreach ($options as $optionValue => $optionText)
 {
-	if (in_array($optionValue, $value))
+	if (in_array((string) $optionValue, $value))
 	{
 		$texts[] = JText::_($optionText);
 	}
diff --git a/components/com_fields/layouts/field/prepare/sql.php b/components/com_fields/layouts/field/prepare/sql.php
index f53cc691937a8..f47a97d62fec3 100644
--- a/components/com_fields/layouts/field/prepare/sql.php
+++ b/components/com_fields/layouts/field/prepare/sql.php
@@ -16,7 +16,7 @@
 $field = $displayData['field'];
 $value = $field->value;
 
-if (!$value)
+if ($value == '')
 {
 	return;
 }
diff --git a/components/com_fields/layouts/field/prepare/textarea.php b/components/com_fields/layouts/field/prepare/textarea.php
index 5a68253c2a72c..5d2ac08810713 100644
--- a/components/com_fields/layouts/field/prepare/textarea.php
+++ b/components/com_fields/layouts/field/prepare/textarea.php
@@ -16,7 +16,7 @@
 $field = $displayData['field'];
 $value = $field->value;
 
-if (!$value)
+if ($value == '')
 {
 	return;
 }
diff --git a/components/com_fields/layouts/field/prepare/url.php b/components/com_fields/layouts/field/prepare/url.php
index 32ab25cda21cf..18a78b015afd9 100644
--- a/components/com_fields/layouts/field/prepare/url.php
+++ b/components/com_fields/layouts/field/prepare/url.php
@@ -16,7 +16,7 @@
 $field = $displayData['field'];
 $value = $field->value;
 
-if (!$value)
+if ($value == '')
 {
 	return;
 }
diff --git a/components/com_fields/layouts/field/prepare/user.php b/components/com_fields/layouts/field/prepare/user.php
index 27047ee6f3f6b..80e37e1cb7a20 100644
--- a/components/com_fields/layouts/field/prepare/user.php
+++ b/components/com_fields/layouts/field/prepare/user.php
@@ -16,7 +16,7 @@
 $field = $displayData['field'];
 $value = $field->value;
 
-if (!$value)
+if ($value == '')
 {
 	return;
 }
diff --git a/components/com_fields/layouts/field/prepare/usergrouplist.php b/components/com_fields/layouts/field/prepare/usergrouplist.php
index 925343ba5066e..4cc0dd2c247d1 100644
--- a/components/com_fields/layouts/field/prepare/usergrouplist.php
+++ b/components/com_fields/layouts/field/prepare/usergrouplist.php
@@ -16,7 +16,7 @@
 $field = $displayData['field'];
 $value = $field->value;
 
-if (!$value)
+if ($value == '')
 {
 	return;
 }
diff --git a/components/com_fields/layouts/field/render.php b/components/com_fields/layouts/field/render.php
index 960465532014e..628ca4dc35526 100644
--- a/components/com_fields/layouts/field/render.php
+++ b/components/com_fields/layouts/field/render.php
@@ -18,7 +18,7 @@
 $value = $field->value;
 $class = $field->params->get('render_class');
 
-if (!$value)
+if ($value == '')
 {
 	return;
 }
diff --git a/components/com_fields/layouts/fields/render.php b/components/com_fields/layouts/fields/render.php
index bd37bba14cbe8..28897e7b71878 100644
--- a/components/com_fields/layouts/fields/render.php
+++ b/components/com_fields/layouts/fields/render.php
@@ -70,8 +70,8 @@
 // Loop through the fields and print them
 foreach ($fields as $field)
 {
-	// If the value is empty dp nothing
-	if (!isset($field->value) || !$field->value)
+	// If the value is empty do nothing
+	if (!isset($field->value) || $field->value == '')
 	{
 		continue;
 	}

From a6a0a96e3868ee4ccf3979206c99f4a29a0af3a4 Mon Sep 17 00:00:00 2001
From: andrepereiradasilva <andrepereiradasilva@users.noreply.github.com>
Date: Tue, 6 Dec 2016 22:06:54 +0000
Subject: [PATCH 11/39] [ACL] JAccess bug fixes and optimizations [B/C
 alternative proposal] (#12850)

* revert JAccess back to 3.6.4

* changes since 3.6.4

* cs

* fix 1

* fix 2

* minor doc block change

* minor doc block changes

* another minor doc block change

* cs: remove tab from doc block

* minor comments changes

* return the correct data type
---
 libraries/joomla/access/access.php | 715 +++++++++++++++++++----------
 1 file changed, 463 insertions(+), 252 deletions(-)

diff --git a/libraries/joomla/access/access.php b/libraries/joomla/access/access.php
index 8e25eb1af242f..3157e0e625ba9 100644
--- a/libraries/joomla/access/access.php
+++ b/libraries/joomla/access/access.php
@@ -49,6 +49,7 @@ class JAccess
 	 *
 	 * @var    array
 	 * @since  11.1
+	 * @deprecated  __DEPLOY_VERSION__  No replacement. Will be removed in 4.0.
 	 */
 	protected static $assetPermissionsById = array();
 
@@ -58,9 +59,18 @@ class JAccess
 	 *
 	 * @var    array
 	 * @since  11.1
+	 * @deprecated  __DEPLOY_VERSION__  No replacement. Will be removed in 4.0.
 	 */
 	protected static $assetPermissionsByName = array();
 
+	/**
+	 * Array of the permission parent ID mappings
+	 *
+	 * @var    array
+	 * @since  11.1
+	 */
+	protected static $assetPermissionsParentIdMapping = array();
+
 	/**
 	 * Array of asset types that have been preloaded
 	 *
@@ -102,12 +112,20 @@ class JAccess
 	protected static $groupsByUser = array();
 
 	/**
-	 * Flag to indicate if components assets have been preloaded.
+	 * Array of preloaded asset names and ids (key is the asset id).
 	 *
-	 * @var    boolean
+	 * @var    array
 	 * @since  __DEPLOY_VERSION__
 	 */
-	protected static $componentsPreloaded = false;
+	protected static $preloadedAssets = array();
+
+	/**
+	 * The root asset id.
+	 *
+	 * @var    integer
+	 * @since  __DEPLOY_VERSION__
+	 */
+	protected static $rootAssetId = null;
 
 	/**
 	 * Method for clearing static caches.
@@ -118,61 +136,40 @@ class JAccess
 	 */
 	public static function clearStatics()
 	{
-		self::$componentsPreloaded    = false;
-		self::$viewLevels             = array();
+		self::$viewLevels                      = array();
+		self::$assetRules                      = array();
+		self::$assetRulesIdentities            = array();
+		self::$assetPermissionsParentIdMapping = array();
+		self::$preloadedAssetTypes             = array();
+		self::$identities                      = array();
+		self::$userGroups                      = array();
+		self::$userGroupPaths                  = array();
+		self::$groupsByUser                    = array();
+		self::$preloadedAssets                 = array();
+		self::$rootAssetId                     = null;
+
+		// The following properties are deprecated since __DEPLOY_VERSION__ and will be removed in 4.0.
 		self::$assetPermissionsById   = array();
 		self::$assetPermissionsByName = array();
-		self::$preloadedAssetTypes    = array();
-		self::$identities             = array();
-		self::$assetRules             = array();
-		self::$userGroups             = array();
-		self::$userGroupPaths         = array();
-		self::$groupsByUser           = array();
 	}
 
 	/**
 	 * Method to check if a user is authorised to perform an action, optionally on an asset.
 	 *
-	 * @param   integer  $userId   Id of the user for which to check authorisation.
-	 * @param   string   $action   The name of the action to authorise.
-	 * @param   mixed    $asset    Integer asset id or the name of the asset as a string.  Defaults to the global asset node.
-	 * @param   boolean  $preload  Indicates whether preloading should be used
+	 * @param   integer         $userId    Id of the user for which to check authorisation.
+	 * @param   string          $action    The name of the action to authorise.
+	 * @param   integer|string  $assetKey  The asset key (asset id or asset name). null fallback to root asset.
+	 * @param   boolean         $preload   Indicates whether preloading should be used.
 	 *
 	 * @return  boolean  True if authorised.
 	 *
 	 * @since   11.1
 	 */
-	public static function check($userId, $action, $asset = null, $preload = true)
+	public static function check($userId, $action, $assetKey = null, $preload = true)
 	{
 		// Sanitise inputs.
 		$userId = (int) $userId;
 		$action = strtolower(preg_replace('#[\s\-]+#', '.', trim($action)));
-		$asset  = strtolower(preg_replace('#[\s\-]+#', '.', trim($asset)));
-
-		// Default to the root asset node.
-		if (empty($asset))
-		{
-			$db = JFactory::getDbo();
-			$assets = JTable::getInstance('Asset', 'JTable', array('dbo' => $db));
-			$asset  = $assets->getRootId();
-		}
-
-		// Auto preloads assets for the asset type:
-		if (!is_numeric($asset) && $preload)
-		{
-			$assetType = self::getAssetType($asset);
-
-			if (!isset(self::$preloadedAssetTypes[$assetType]))
-			{
-				self::preload($assetType);
-			}
-		}
-
-		// Get the rules for the asset recursively to root if not already retrieved.
-		if (empty(self::$assetRules[$asset]))
-		{
-			self::$assetRules[$asset] = self::getAssetRules($asset, true);
-		}
 
 		if (!isset(self::$identities[$userId]))
 		{
@@ -181,46 +178,42 @@ public static function check($userId, $action, $asset = null, $preload = true)
 			array_unshift(self::$identities[$userId], $userId * -1);
 		}
 
-		return self::$assetRules[$asset]->allow($action, self::$identities[$userId]);
+		return self::getAssetRules($assetKey, true, true, $preload)->allow($action, self::$identities[$userId]);
 	}
 
 	/**
 	 * Method to preload the JAccessRules object for the given asset type.
 	 *
-	 * @param   string|array  $assetTypes  e.g. 'com_content.article'
-	 * @param   boolean       $reload      Set to true to reload from database.
+	 * @param   integer|string|array  $assetTypes  The type or name of the asset (e.g. 'com_content.article', 'com_menus.menu.2').
+	 *                                             Also accepts the asset id. An array of asset type or a special
+	 *                                             'components' string to load all component assets.
+	 * @param   boolean               $reload      Set to true to reload from database.
 	 *
-	 * @return   boolean True on success.
+	 * @return  boolean  True on success.
 	 *
-	 * @since    1.6
+	 * @since   1.6
+	 * @note    This method will return void in 4.0.
 	 */
 	public static function preload($assetTypes = 'components', $reload = false)
 	{
+		// If sent an asset id, we first get the asset type for that asset id.
+		if (is_numeric($assetTypes))
+		{
+			$assetTypes = self::getAssetType($assetTypes);
+		}
+
 		// Check for default case:
 		$isDefault = is_string($assetTypes) && in_array($assetTypes, array('components', 'component'));
 
-		// Preload the rules for all of the components:
-		if ($isDefault && !self::$componentsPreloaded)
+		// Preload the rules for all of the components.
+		if ($isDefault)
 		{
-			// Mark in the profiler.
-			!JDEBUG ?: JProfiler::getInstance('Application')->mark('Before JAccess::preload (all components)');
-
 			self::preloadComponents();
-			self::$componentsPreloaded = true;
-
-			// Mark in the profiler.
-			!JDEBUG ?: JProfiler::getInstance('Application')->mark('After JAccess::preload (all components)');
-		}
 
-		// Quick short circuit for default case
-		if ($isDefault)
-		{
 			return true;
 		}
 
-		// If we get to this point, this is a regular asset type
-		// and we'll proceed with the preloading process.
-
+		// If we get to this point, this is a regular asset type and we'll proceed with the preloading process.
 		if (!is_array($assetTypes))
 		{
 			$assetTypes = (array) $assetTypes;
@@ -228,15 +221,7 @@ public static function preload($assetTypes = 'components', $reload = false)
 
 		foreach ($assetTypes as $assetType)
 		{
-			if (!isset(self::$preloadedAssetTypes[$assetType]) || $reload)
-			{
-				!JDEBUG ?: JProfiler::getInstance('Application')->mark('Before JAccess::preload (' . $assetType . ')');
-
-				self::preloadPermissions($assetType);
-				self::$preloadedAssetTypes[$assetType] = true;
-
-				!JDEBUG ?: JProfiler::getInstance('Application')->mark('After JAccess::preload (' . $assetType . ')');
-			}
+			self::preloadPermissions($assetType, $reload);
 		}
 
 		return true;
@@ -246,15 +231,19 @@ public static function preload($assetTypes = 'components', $reload = false)
 	 * Method to recursively retrieve the list of parent Asset IDs
 	 * for a particular Asset.
 	 *
-	 * @param   string      $extensionName  e.g. 'com_content.article'
-	 * @param   string|int  $assetId        numeric Asset ID
+	 * @param   string   $assetType  The asset type, or the asset name, or the extension of the asset
+	 *                               (e.g. 'com_content.article', 'com_menus.menu.2', 'com_contact').
+	 * @param   integer  $assetId    The numeric asset id.
 	 *
-	 * @return   array  List of Ancestor IDs (includes original $assetId)
+	 * @return  array  List of ancestor ids (includes original $assetId).
 	 *
-	 * @since    1.6
+	 * @since   1.6
 	 */
-	protected static function getAssetAncestors($extensionName, $assetId)
+	protected static function getAssetAncestors($assetType, $assetId)
 	{
+		// Get the extension name from the $assetType provided
+		$extensionName = self::getExtensionNameFromAsset($assetType);
+
 		// Holds the list of ancestors for the Asset ID:
 		$ancestors = array();
 
@@ -266,9 +255,9 @@ protected static function getAssetAncestors($extensionName, $assetId)
 
 		while ($id !== 0)
 		{
-			if (isset(self::$assetPermissionsById[$extensionName][$id]))
+			if (isset(self::$assetPermissionsParentIdMapping[$extensionName][$id]))
 			{
-				$id = (int) self::$assetPermissionsById[$extensionName][$id]->parent_id;
+				$id = (int) self::$assetPermissionsParentIdMapping[$extensionName][$id]->parent_id;
 
 				if ($id !== 0)
 				{
@@ -286,46 +275,109 @@ protected static function getAssetAncestors($extensionName, $assetId)
 		return $ancestors;
 	}
 
+	/**
+	 * Method to retrieve the list of Asset IDs and their Parent Asset IDs
+	 * and store them for later usage in getAssetRules().
+	 *
+	 * @param   string  $assetType  The asset type, or the asset name, or the extension of the asset
+	 *                              (e.g. 'com_content.article', 'com_menus.menu.2', 'com_contact').
+	 *
+	 * @return  array  List of asset ids (includes parent asset id information).
+	 *
+	 * @since   1.6
+	 * @deprecated  __DEPLOY_VERSION__  No replacement. Will be removed in 4.0.
+	 */
+	protected static function &preloadPermissionsParentIdMapping($assetType)
+	{
+		// Get the extension name from the $assetType provided
+		$extensionName = self::getExtensionNameFromAsset($assetType);
+
+		if (!isset(self::$assetPermissionsParentIdMapping[$extensionName]))
+		{
+			// Get the database connection object.
+			$db = JFactory::getDbo();
+
+			// Get a fresh query object:
+			$query    = $db->getQuery(true);
+
+			// Build the database query:
+			$query->select('a.id, a.parent_id');
+			$query->from('#__assets AS a');
+			$query->where('(a.name LIKE ' . $db->quote($extensionName . '.%') . ' OR a.name = ' . $db->quote($extensionName) . ' OR a.id = 1)');
+
+			// Get the Name Permission Map List
+			$db->setQuery($query);
+			$parentIdMapping = $db->loadObjectList('id');
+
+			self::$assetPermissionsParentIdMapping[$extensionName] = &$parentIdMapping;
+		}
+
+		return self::$assetPermissionsParentIdMapping[$extensionName];
+	}
+
 	/**
 	 * Method to retrieve the Asset Rule strings for this particular
 	 * Asset Type and stores them for later usage in getAssetRules().
 	 * Stores 2 arrays: one where the list has the Asset ID as the key
 	 * and a second one where the Asset Name is the key.
 	 *
-	 * @param   string  $assetType  e.g. 'com_content.article'
+	 * @param   string   $assetType  The asset type, or the asset name, or the extension of the asset
+	 *                               (e.g. 'com_content.article', 'com_menus.menu.2', 'com_contact').
+	 * @param   boolean  $reload     Reload the preloaded assets.
 	 *
-	 * @return   bool  True
+	 * @return  bool  True
 	 *
-	 * @since    1.6
+	 * @since   1.6
+	 * @note    This function will return void in 4.0.
 	 */
-	protected static function preloadPermissions($assetType)
+	protected static function preloadPermissions($assetType, $reload = false)
 	{
 		// Get the extension name from the $assetType provided
 		$extensionName = self::getExtensionNameFromAsset($assetType);
 
-		// Get the database connection object.
-		$db = JFactory::getDbo();
+		// If asset is a component, make sure that all the component assets are preloaded.
+		if ((isset(self::$preloadedAssetTypes[$extensionName]) || isset(self::$preloadedAssetTypes[$assetType])) && !$reload)
+		{
+			return true;
+		}
 
-		$parents = implode(',', $db->q(array($extensionName, 'root.1')));
+		!JDEBUG ?: JProfiler::getInstance('Application')->mark('Before JAccess::preloadPermissions (' . $extensionName . ')');
 
-		// Get a fresh query object:
+		// Get the database connection object.
+		$db         = JFactory::getDbo();
+		$extraQuery = $db->qn('name') . ' = ' . $db->q($extensionName) . ' OR ' . $db->qn('parent_id') . ' = 0';
+
+		// Get a fresh query object.
 		$query = $db->getQuery(true)
 			->select($db->qn(array('id', 'name', 'rules', 'parent_id')))
 			->from($db->qn('#__assets'))
-			->where($db->qn('name') . ' LIKE ' . $db->q($extensionName . '.%') . ' OR ' . $db->qn('name') . ' IN (' . $parents . ')');
+			->where($db->qn('name') . ' LIKE ' . $db->q($extensionName . '.%') . ' OR ' . $extraQuery);
 
-		// Get the Name Permission Map List
+		// Get the permission map for all assets in the asset extension.
 		$assets = $db->setQuery($query)->loadObjectList();
 
-		self::$assetPermissionsById[$extensionName]   = array();
-		self::$assetPermissionsByName[$extensionName] = array();
+		self::$assetPermissionsParentIdMapping[$extensionName] = array();
+
+		// B/C Populate the old class properties. They are deprecated since __DEPLOY_VERSION__ and will be removed in 4.0.
+		self::$assetPermissionsById[$assetType]   = array();
+		self::$assetPermissionsByName[$assetType] = array();
 
 		foreach ($assets as $asset)
 		{
-			self::$assetPermissionsById[$extensionName][$asset->id]     = $asset;
-			self::$assetPermissionsByName[$extensionName][$asset->name] = $asset;
+			self::$assetPermissionsParentIdMapping[$extensionName][$asset->id] = $asset;
+			self::$preloadedAssets[$asset->id]                                 = $asset->name;
+
+			// B/C Populate the old class properties. They are deprecated since __DEPLOY_VERSION__ and will be removed in 4.0.
+			self::$assetPermissionsById[$assetType][$asset->id]     = $asset;
+			self::$assetPermissionsByName[$assetType][$asset->name] = $asset;
 		}
 
+		// Mark asset type and it's extension name as preloaded.
+		self::$preloadedAssetTypes[$assetType]     = true;
+		self::$preloadedAssetTypes[$extensionName] = true;
+
+		!JDEBUG ?: JProfiler::getInstance('Application')->mark('After JAccess::preloadPermissions (' . $extensionName . ')');
+
 		return true;
 	}
 
@@ -336,12 +388,20 @@ protected static function preloadPermissions($assetType)
 	 * e.g. it will get 'com_content', but not 'com_content.article.1' or
 	 * any more specific asset type rules.
 	 *
-	 * @return   array Array of component names that were preloaded.
+	 * @return   array  Array of component names that were preloaded.
 	 *
 	 * @since    1.6
 	 */
 	protected static function preloadComponents()
 	{
+		// If the components already been preloaded do nothing.
+		if (isset(self::$preloadedAssetTypes['components']))
+		{
+			return array();
+		}
+
+		!JDEBUG ?: JProfiler::getInstance('Application')->mark('Before JAccess::preloadComponents (all components)');
+
 		// Add root to asset names list.
 		$components = array();
 
@@ -361,80 +421,66 @@ protected static function preloadComponents()
 		$query = $db->getQuery(true)
 			->select($db->qn(array('id', 'name', 'rules', 'parent_id')))
 			->from($db->qn('#__assets'))
-			->where($db->qn('name') . ' IN (' . implode(',', $db->quote($components)) . ', ' . $db->quote('root.1') . ')');
+			->where($db->qn('name') . ' IN (' . implode(',', $db->quote($components)) . ') OR ' . $db->qn('parent_id') . ' = 0');
 
 		// Get the Name Permission Map List
-		$assets = $db->setQuery($query)->loadObjectList('name');
+		$assets = $db->setQuery($query)->loadObjectList();
 
-		// Add the root asset as parent of all components.
-		$assetsTree = array();
-		$rootName   = 'root.1';
+		$rootAsset = null;
 
-		foreach ($assets as $extensionName => $asset)
+		// First add the root asset and save it to preload memory and mark it as preloaded.
+		foreach ($assets as &$asset)
 		{
-			$assetsTree[$extensionName][] = $assets[$rootName];
-
-			if ($extensionName !== $rootName)
+			if ((int) $asset->parent_id === 0)
 			{
-				$assetsTree[$extensionName][] = $assets[$extensionName];
+				$rootAsset                                                       = $asset;
+				self::$rootAssetId                                               = $asset->id;
+				self::$preloadedAssetTypes[$asset->name]                         = true;
+				self::$preloadedAssets[$asset->id]                               = $asset->name;
+				self::$assetPermissionsParentIdMapping[$asset->name][$asset->id] = $asset;
+
+				unset($asset);
+				break;
 			}
 		}
 
-		// Save the permissions for the components asset.
-		foreach ($assetsTree as $extensionName => $assets)
+		// Now create save the components asset tree to preload memory.
+		foreach ($assets as $asset)
 		{
-			if (!isset(self::$preloadedAssetTypes[$extensionName]))
+			if (!isset(self::$assetPermissionsParentIdMapping[$asset->name]))
 			{
-				self::$assetPermissionsById[$extensionName]   = array();
-				self::$assetPermissionsByName[$extensionName] = array();
-
-				foreach ($assets as $asset)
-				{
-					self::$assetPermissionsById[$extensionName][$asset->id]     = $asset;
-					self::$assetPermissionsByName[$extensionName][$asset->name] = $asset;
-				}
-
-				self::$preloadedAssetTypes[$extensionName] = true;
+				self::$assetPermissionsParentIdMapping[$asset->name] = array($rootAsset->id => $rootAsset, $asset->id => $asset);
+				self::$preloadedAssets[$asset->id]                   = $asset->name;
 			}
 		}
+
+		// Mark all components asset type as preloaded.
+		self::$preloadedAssetTypes['components'] = true;
+
+		!JDEBUG ?: JProfiler::getInstance('Application')->mark('After JAccess::preloadComponents (all components)');
+
+		return $components;
 	}
 
 	/**
 	 * Method to check if a group is authorised to perform an action, optionally on an asset.
 	 *
-	 * @param   integer  $groupId  The path to the group for which to check authorisation.
-	 * @param   string   $action   The name of the action to authorise.
-	 * @param   mixed    $asset    Integer asset id or the name of the asset as a string.  Defaults to the global asset node.
+	 * @param   integer         $groupId   The path to the group for which to check authorisation.
+	 * @param   string          $action    The name of the action to authorise.
+	 * @param   integer|string  $assetKey  The asset key (asset id or asset name). null fallback to root asset.
+	 * @param   boolean         $preload   Indicates whether preloading should be used.
 	 *
 	 * @return  boolean  True if authorised.
 	 *
 	 * @since   11.1
 	 */
-	public static function checkGroup($groupId, $action, $asset = null)
+	public static function checkGroup($groupId, $action, $assetKey = null, $preload = true)
 	{
-		// Sanitize inputs.
+		// Sanitize input.
 		$groupId = (int) $groupId;
-		$action = strtolower(preg_replace('#[\s\-]+#', '.', trim($action)));
-		$asset = strtolower(preg_replace('#[\s\-]+#', '.', trim($asset)));
-
-		// Get group path for group
-		$groupPath = self::getGroupPath($groupId);
+		$action  = strtolower(preg_replace('#[\s\-]+#', '.', trim($action)));
 
-		// Default to the root asset node.
-		if (empty($asset))
-		{
-			$db = JFactory::getDbo();
-			$assets = JTable::getInstance('Asset', 'JTable', array('dbo' => $db));
-			$asset = $assets->getRootId();
-		}
-
-		// Get the rules for the asset recursively to root if not already retrieved.
-		if (empty(self::$assetRules[$asset]))
-		{
-			self::$assetRules[$asset] = self::getAssetRules($asset, true);
-		}
-
-		return self::$assetRules[$asset]->allow($action, $groupPath);
+		return self::getAssetRules($assetKey, true, true, $preload)->allow($action, self::getGroupPath($groupId));
 	}
 
 	/**
@@ -465,50 +511,105 @@ protected static function getGroupPath($groupId)
 	 * only the rules explicitly set for the asset or the summation of all inherited rules from
 	 * parent assets and explicit rules.
 	 *
-	 * @param   mixed    $asset                 Integer asset id or the name of the asset as a string.
-	 * @param   boolean  $recursive             True to return the rules object with inherited rules.
-	 * @param   boolean  $recursiveParentAsset  True to calculate the rule also based on inherited component/extension rules.
+	 * @param   integer|string  $assetKey              The asset key (asset id or asset name). null fallback to root asset.
+	 * @param   boolean         $recursive             True to return the rules object with inherited rules.
+	 * @param   boolean         $recursiveParentAsset  True to calculate the rule also based on inherited component/extension rules.
+	 * @param   boolean         $preload               Indicates whether preloading should be used.
 	 *
-	 * @return  JAccessRules   JAccessRules object for the asset.
+	 * @return  JAccessRules  JAccessRules object for the asset.
 	 *
 	 * @since   11.1
+	 * @note    The non preloading code will be removed in 4.0. All asset rules should use asset preloading.
 	 */
-	public static function getAssetRules($asset, $recursive = false, $recursiveParentAsset = true)
+	public static function getAssetRules($assetKey, $recursive = false, $recursiveParentAsset = true, $preload = true)
 	{
-		$method = '';
+		// Auto preloads the components assets and root asset (if chosen).
+		if ($preload)
+		{
+			self::preload('components');
+		}
 
-		// Get instance of the Profiler:
-		$extensionName = self::getExtensionNameFromAsset($asset);
-		$assetType     = self::getAssetType($asset);
+		// When asset key is null fallback to root asset.
+		$assetKey = self::cleanAssetKey($assetKey);
 
-		// Make sure the components assets are preloaded.
-		if (!self::$componentsPreloaded)
+		// Auto preloads assets for the asset type (if chosen).
+		if ($preload)
 		{
-			self::preload('components');
+			self::preload(self::getAssetType($assetKey));
+		}
+
+		// Get the asset id and name.
+		$assetId = self::getAssetId($assetKey);
+
+		// If asset rules already cached em memory return it (only in full recursive mode).
+		if ($recursive && $recursiveParentAsset && $assetId && isset(self::$assetRules[$assetId]))
+		{
+			return self::$assetRules[$assetId];
 		}
 
-		!JDEBUG ?: JProfiler::getInstance('Application')->mark('Before JAccess::getAssetRules (' . $asset . ')');
+		// Get the asset name and the extension name.
+		$assetName     = self::getAssetName($assetKey);
+		$extensionName = self::getExtensionNameFromAsset($assetName);
 
-		// Almost all calls should have recursive set to true so we'll get to take advantage of preloading.
-		if ($recursive && $recursiveParentAsset && (isset(self::$preloadedAssetTypes[$assetType]) || isset(self::$preloadedAssetTypes[$extensionName])))
+		// If asset id does not exist fallback to extension asset, then root asset.
+		if (!$assetId)
 		{
-			// The asset type (ex: com_modules.module) as been preloaded, but the asset does not exist  (ex: com_modules.module.37).
-			// In this case we fallback to extension name asset.
-			if (!isset(self::$assetPermissionsByName[$extensionName][$asset]))
+			if ($extensionName && $assetName !== $extensionName)
 			{
-				self::$assetPermissionsByName[$extensionName][$asset] = self::$assetPermissionsByName[$extensionName][$extensionName];
+				JLog::add('No asset found for ' . $assetName . ', falling back to ' . $extensionName, JLog::WARNING, 'assets');
+
+				return self::getAssetRules($extensionName, $recursive, $recursiveParentAsset, $preload);
 			}
 
-			$assetId = self::$assetPermissionsByName[$extensionName][$asset]->id;
+			if (self::$rootAssetId !== null && $assetName !== self::$preloadedAssets[self::$rootAssetId])
+			{
+				JLog::add('No asset found for ' . $assetName . ', falling back to ' . self::$preloadedAssets[self::$rootAssetId], JLog::WARNING, 'assets');
 
-			$ancestors = array_reverse(self::getAssetAncestors($extensionName, $assetId));
+				return self::getAssetRules(self::$preloadedAssets[self::$rootAssetId], $recursive, $recursiveParentAsset, $preload);
+			}
+		}
 
-			// Collects permissions for each $asset
+		// Almost all calls can take advantage of preloading.
+		if ($assetId && isset(self::$preloadedAssets[$assetId]))
+		{
+			!JDEBUG ?: JProfiler::getInstance('Application')->mark('Before JAccess::getAssetRules (id:' . $assetId . ' name:' . $assetName . ')');
+
+			// Collects permissions for each asset
 			$collected = array();
 
-			foreach ($ancestors as $id)
+			// If not in any recursive mode. We only want the asset rules.
+			if (!$recursive && !$recursiveParentAsset)
+			{
+				$collected = array(self::$assetPermissionsParentIdMapping[$extensionName][$assetId]->rules);
+			}
+			// If there is any type of recursive mode.
+			else
 			{
-				$collected[] = self::$assetPermissionsById[$extensionName][$id]->rules;
+				$ancestors = array_reverse(self::getAssetAncestors($extensionName, $assetId));
+
+				foreach ($ancestors as $id)
+				{
+					// If full recursive mode, but not recursive parent mode, do not add the extension asset rules.
+					if ($recursive && !$recursiveParentAsset && self::$assetPermissionsParentIdMapping[$extensionName][$id]->name === $extensionName)
+					{
+						continue;
+					}
+
+					// If not full recursive mode, but recursive parent mode, do not add other recursion rules.
+					if (!$recursive && $recursiveParentAsset && self::$assetPermissionsParentIdMapping[$extensionName][$id]->name !== $extensionName
+						&& self::$assetPermissionsParentIdMapping[$extensionName][$id]->id !== $assetId)
+					{
+						continue;
+					}
+
+					// If empty asset to not add to rules.
+					if (self::$assetPermissionsParentIdMapping[$extensionName][$id]->rules === '{}')
+					{
+						continue;
+					}
+
+					$collected[] = self::$assetPermissionsParentIdMapping[$extensionName][$id]->rules;
+				}
 			}
 
 			/**
@@ -527,124 +628,236 @@ public static function getAssetRules($asset, $recursive = false, $recursiveParen
 				self::$assetRulesIdentities[$hash] = $rules;
 			}
 
-			$rules = self::$assetRulesIdentities[$hash];
+			// Save asset rules to memory cache(only in full recursive mode).
+			if ($recursive && $recursiveParentAsset)
+			{
+				self::$assetRules[$assetId] = self::$assetRulesIdentities[$hash];
+			}
+
+			!JDEBUG ?: JProfiler::getInstance('Application')->mark('After JAccess::getAssetRules (id:' . $assetId . ' name:' . $assetName . ')');
+
+			return self::$assetRulesIdentities[$hash];
 		}
-		else
+
+		// Non preloading code. Use old slower method, slower. Only used in rare cases (if any) or without preloading chosen.
+		JLog::add('Asset ' . $assetKey . ' permissions fetch without preloading (slower method).', JLog::INFO, 'assets');
+
+		!JDEBUG ?: JProfiler::getInstance('Application')->mark('Before JAccess::getAssetRules (assetKey:' . $assetKey . ')');
+
+		// There's no need to process it with the recursive method for the Root Asset ID.
+		if ((int) $assetKey === 1)
 		{
-			$method = ' <strong>Slower</strong>, no preloading, method used.';
+			$recursive = false;
+		}
 
-			if ($asset === "1")
-			{
-				// There's no need to process it with the
-				// recursive method for the Root Asset ID.
-				$recursive = false;
-			}
+		// Get the database connection object.
+		$db = JFactory::getDbo();
 
-			// Get the database connection object.
-			$db = JFactory::getDbo();
+		// Build the database query to get the rules for the asset.
+		$query = $db->getQuery(true)
+			->select($db->qn(($recursive ? 'b.rules' : 'a.rules'), 'rules'))
+			->select($db->qn(($recursive ? array('b.id', 'b.name', 'b.parent_id') : array('a.id', 'a.name', 'a.parent_id'))))
+			->from($db->qn('#__assets', 'a'));
 
-			// Build the database query to get the rules for the asset.
-			$query = $db->getQuery(true)
-				->select($recursive ? 'DISTINCT(b.rules)' : 'a.rules')
-				->from('#__assets AS a');
+		// If the asset identifier is numeric assume it is a primary key, else lookup by name.
+		$assetString     = is_numeric($assetKey) ? $db->qn('a.id') . ' = ' . $assetKey : $db->qn('a.name') . ' = ' . $db->q($assetKey);
+		$extensionString = '';
 
-			$extensionString = '';
+		if ($recursiveParentAsset && ($extensionName !== $assetKey || is_numeric($assetKey)))
+		{
+			$extensionString = ' OR ' . $db->qn('a.name') . ' = ' . $db->q($extensionName);
+		}
 
-			if ($recursiveParentAsset && ($extensionName !== $asset || is_numeric($asset)))
-			{
-				$extensionString = ' OR a.name = ' . $db->quote($extensionName);
-			}
+		$recursiveString = $recursive ? ' OR ' . $db->qn('a.parent_id') . ' = 0' : '';
 
-			$recursiveString = '';
+		$query->where('(' . $assetString . $extensionString . $recursiveString . ')');
 
-			if ($recursive)
-			{
-				$recursiveString = ' OR a.parent_id=0';
-			}
+		// If we want the rules cascading up to the global asset node we need a self-join.
+		if ($recursive)
+		{
+			$query->join('LEFT', $db->qn('#__assets', 'b') . ' ON b.lft <= a.lft AND b.rgt >= a.rgt')
+				->order($db->qn('b.lft'));
+		}
 
-			// If the asset identifier is numeric assume it is a primary key, else lookup by name.
-			if (is_numeric($asset))
-			{
-				$query->where('(a.id = ' . (int) $asset . $extensionString . $recursiveString . ')');
-			}
-			else
-			{
-				$query->where('(a.name = ' . $db->quote($asset) . $extensionString . $recursiveString . ')');
-			}
+		// Execute the query and load the rules from the result.
+		$result = $db->setQuery($query)->loadObjectList();
 
-			// If we want the rules cascading up to the global asset node we need a self-join.
-			if ($recursive)
-			{
-				$query->join('LEFT', '#__assets AS b ON b.lft <= a.lft AND b.rgt >= a.rgt')
-					->order('b.lft');
-			}
+		// Get the root even if the asset is not found and in recursive mode
+		if (empty($result))
+		{
+			$assets = JTable::getInstance('Asset', 'JTable', array('dbo' => $db));
 
-			// Execute the query and load the rules from the result.
-			$db->setQuery($query);
-			$result = $db->loadColumn();
+			$query->clear()
+				->select($db->qn(array('id', 'name', 'parent_id', 'rules')))
+				->from($db->qn('#__assets'))
+				->where($db->qn('id') . ' = ' . $db->q($assets->getRootId()));
 
-			// Get the root even if the asset is not found and in recursive mode
-			if (empty($result))
-			{
-				$db = JFactory::getDbo();
-				$assets = JTable::getInstance('Asset', 'JTable', array('dbo' => $db));
-				$rootId = $assets->getRootId();
-				$query->clear()
-					->select('rules')
-					->from('#__assets')
-					->where('id = ' . $db->quote($rootId));
-				$db->setQuery($query);
-				$result = $db->loadResult();
-				$result = array($result);
-			}
+			$result = $db->setQuery($query)->loadObjectList();
+		}
 
-			// Instantiate and return the JAccessRules object for the asset rules.
-			$rules = new JAccessRules;
-			$rules->mergeCollection($result);
+		$collected = array();
+
+		foreach ($result as $asset)
+		{
+			$collected[] = $asset->rules;
 		}
 
-		!JDEBUG ?: JProfiler::getInstance('Application')->mark('After JAccess::getAssetRules (' . $asset . ')' . $method);
+		// Instantiate and return the JAccessRules object for the asset rules.
+		$rules = new JAccessRules;
+		$rules->mergeCollection($collected);
+
+		!JDEBUG ?: JProfiler::getInstance('Application')->mark('Before JAccess::getAssetRules <strong>Slower</strong> (assetKey:' . $assetKey . ')');
 
 		return $rules;
 	}
 
 	/**
-	 * Method to get the extension name from the asset name.
+	 * Method to clean the asset key to make sure we always have something.
 	 *
-	 * @param   string  $asset  Asset Name
+	 * @param   integer|string  $assetKey  The asset key (asset id or asset name). null fallback to root asset.
 	 *
-	 * @return  string  Extension Name.
+	 * @return  integer|string  Asset id or asset name.
 	 *
-	 * @since    1.6
+	 * @since   __DEPLOY_VERSION__
+	 */
+	protected static function cleanAssetKey($assetKey = null)
+	{
+		// If it's a valid asset key, clean it and return it.
+		if ($assetKey)
+		{
+			return strtolower(preg_replace('#[\s\-]+#', '.', trim($assetKey)));
+		}
+
+		// Return root asset id if already preloaded.
+		if (self::$rootAssetId !== null)
+		{
+			return self::$rootAssetId;
+		}
+
+		// No preload. Return root asset id from JTableAssets.
+		$assets = JTable::getInstance('Asset', 'JTable', array('dbo' => JFactory::getDbo()));
+
+		return $assets->getRootId();
+	}
+
+	/**
+	 * Method to get the asset id from the asset key.
+	 *
+	 * @param   integer|string  $assetKey  The asset key (asset id or asset name).
+	 *
+	 * @return  integer  The asset id.
+	 *
+	 * @since   __DEPLOY_VERSION__
 	 */
-	public static function getExtensionNameFromAsset($asset)
+	protected static function getAssetId($assetKey)
 	{
 		static $loaded = array();
 
-		if (!isset($loaded[$asset]))
+		// If the asset is already an id return it.
+		if (is_numeric($assetKey))
 		{
-			if (is_numeric($asset))
+			return (int) $assetKey;
+		}
+
+		if (!isset($loaded[$assetKey]))
+		{
+			// It's the root asset.
+			if (self::$rootAssetId !== null && $assetKey === self::$preloadedAssets[self::$rootAssetId])
 			{
-				$table = JTable::getInstance('Asset');
-				$table->load($asset);
-				$assetName = $table->name;
+				$loaded[$assetKey] = self::$rootAssetId;
 			}
 			else
 			{
-				$assetName = $asset;
+				$preloadedAssetsByName = array_flip(self::$preloadedAssets);
+
+				// If we already have the asset name stored in preloading, example, a component, no need to fetch it from table.
+				if (isset($preloadedAssetsByName[$assetKey]))
+				{
+					$loaded[$assetKey] = $preloadedAssetsByName[$assetKey];
+				}
+				// Else we have to do an extra db query to fetch it from the table fetch it from table.
+				else
+				{
+					$table = JTable::getInstance('Asset');
+					$table->load(array('name' => $assetKey));
+					$loaded[$assetKey] = $table->id;
+				}
 			}
+		}
 
-			$firstDot = strpos($assetName, '.');
+		return (int) $loaded[$assetKey];
+	}
+
+	/**
+	 * Method to get the asset name from the asset key.
+	 *
+	 * @param   integer|string  $assetKey  The asset key (asset id or asset name).
+	 *
+	 * @return  string  The asset name (ex: com_content.article.8).
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	protected static function getAssetName($assetKey)
+	{
+		static $loaded = array();
+
+		// If the asset is already a string return it.
+		if (!is_numeric($assetKey))
+		{
+			return $assetKey;
+		}
+
+		if (!isset($loaded[$assetKey]))
+		{
+			// It's the root asset.
+			if (self::$rootAssetId !== null && $assetKey === self::$rootAssetId)
+			{
+				$loaded[$assetKey] = self::$preloadedAssets[self::$rootAssetId];
+			}
+			// If we already have the asset name stored in preloading, example, a component, no need to fetch it from table.
+			elseif (isset(self::$preloadedAssets[$assetKey]))
+			{
+				$loaded[$assetKey] = self::$preloadedAssets[$assetKey];
+			}
+			// Else we have to do an extra db query to fetch it from the table fetch it from table.
+			else
+			{
+				$table = JTable::getInstance('Asset');
+				$table->load($assetKey);
+				$loaded[$assetKey] = $table->name;
+			}
+		}
+
+		return $loaded[$assetKey];
+	}
+
+	/**
+	 * Method to get the extension name from the asset name.
+	 *
+	 * @param   integer|string  $assetKey  The asset key (asset id or asset name).
+	 *
+	 * @return  string  The extension name (ex: com_content).
+	 *
+	 * @since    1.6
+	 */
+	public static function getExtensionNameFromAsset($assetKey)
+	{
+		static $loaded = array();
+
+		if (!isset($loaded[$assetKey]))
+		{
+			$assetName = self::getAssetName($assetKey);
+			$firstDot  = strpos($assetName, '.');
 
 			if ($assetName !== 'root.1' && $firstDot !== false)
 			{
 				$assetName = substr($assetName, 0, $firstDot);
 			}
 
-			$loaded[$asset] = $assetName;
+			$loaded[$assetKey] = $assetName;
 		}
 
-		return $loaded[$asset];
+		return $loaded[$assetKey];
 	}
 
 	/**
@@ -657,26 +870,24 @@ public static function getExtensionNameFromAsset($asset)
 	 * 'com_content.article.1' returns 'com_content.article'
 	 * 'com_content.category.1' returns 'com_content.category'
 	 *
-	 * @param   string  $asset  Asset Name
+	 * @param   integer|string  $assetKey  The asset key (asset id or asset name).
 	 *
-	 * @return  string  Asset Type.
+	 * @return  string  The asset type (ex: com_content.article).
 	 *
 	 * @since    1.6
 	 */
-	public static function getAssetType($asset)
+	public static function getAssetType($assetKey)
 	{
-		$lastDot = strrpos($asset, '.');
+		// If the asset is already a string return it.
+		$assetName = self::getAssetName($assetKey);
+		$lastDot   = strrpos($assetName, '.');
 
-		if ($asset !== 'root.1' && $lastDot !== false)
-		{
-			$assetType = substr($asset, 0, $lastDot);
-		}
-		else
+		if ($assetName !== 'root.1' && $lastDot !== false)
 		{
-			$assetType = 'components';
+			return substr($assetName, 0, $lastDot);
 		}
 
-		return $assetType;
+		return 'components';
 	}
 
 	/**

From ef99fd040fd059d5ea8a1b922ca1f26fb9df990a Mon Sep 17 00:00:00 2001
From: andrepereiradasilva <andrepereiradasilva@users.noreply.github.com>
Date: Tue, 6 Dec 2016 22:07:35 +0000
Subject: [PATCH 12/39] [ACL] Backend ordering columns in list views review
 (#12867)

* isis: banners view

* isis: com_content featured view

* isis: com_menus items view

* isis: com_newsfeeds newsfeed view

* isis: com_plugins plugins view

* isis: com_tags tags view

* isis: com_users levels view

* hathor: com_banners banners view

* hathor: com_categories categories view

* hathor: com_contact contacts view

* hathor: com_content featured view

* Update default.php

* Update default.php

* Update default.php

* hathor: com_languages languages view

* Update default.php

* hathor: com_menus items view

* hathor: com_modules modules view

* hathor: com_newsfeeds newsfeeds view

* hathor: com_plugins plugins view

* hathor: com_weblinks weblinks view

* hathor: com_users levels view

* Update default.php

* Update default.php

* Update default.php

* Update default.php

* Update default.php

* Update default.php

* Update default.php

* Update default.php

* Update default.php

* Update default.php

* Update default.php

* Update default.php
---
 .../com_banners/views/banners/tmpl/default.php       |  1 -
 .../com_content/views/featured/tmpl/default.php      |  1 -
 .../com_menus/views/items/tmpl/default.php           |  1 -
 .../com_newsfeeds/views/newsfeeds/tmpl/default.php   |  1 -
 .../com_plugins/views/plugins/tmpl/default.php       |  1 -
 .../components/com_tags/views/tags/tmpl/default.php  |  1 -
 .../com_users/views/levels/tmpl/default.php          |  1 -
 .../hathor/html/com_banners/banners/default.php      |  2 +-
 .../html/com_categories/categories/default.php       |  7 ++++---
 .../hathor/html/com_contact/contacts/default.php     |  4 ++--
 .../hathor/html/com_content/featured/default.php     |  4 ++--
 .../hathor/html/com_languages/languages/default.php  |  4 ++--
 .../hathor/html/com_menus/items/default.php          | 12 +++++-------
 .../hathor/html/com_modules/modules/default.php      |  2 +-
 .../hathor/html/com_newsfeeds/newsfeeds/default.php  |  4 ++--
 .../hathor/html/com_plugins/plugins/default.php      |  6 +++---
 .../hathor/html/com_users/levels/default.php         |  2 +-
 .../hathor/html/com_weblinks/weblinks/default.php    |  6 +++---
 18 files changed, 26 insertions(+), 34 deletions(-)

diff --git a/administrator/components/com_banners/views/banners/tmpl/default.php b/administrator/components/com_banners/views/banners/tmpl/default.php
index 5f7804e9cf825..4363bd611c82e 100644
--- a/administrator/components/com_banners/views/banners/tmpl/default.php
+++ b/administrator/components/com_banners/views/banners/tmpl/default.php
@@ -19,7 +19,6 @@
 $userId    = $user->get('id');
 $listOrder = $this->escape($this->state->get('list.ordering'));
 $listDirn  = $this->escape($this->state->get('list.direction'));
-$canOrder  = $user->authorise('core.edit.state', 'com_banners.category');
 $saveOrder = $listOrder == 'a.ordering';
 
 if ($saveOrder)
diff --git a/administrator/components/com_content/views/featured/tmpl/default.php b/administrator/components/com_content/views/featured/tmpl/default.php
index 8dffb74376bc6..52f5a8b95fe45 100644
--- a/administrator/components/com_content/views/featured/tmpl/default.php
+++ b/administrator/components/com_content/views/featured/tmpl/default.php
@@ -19,7 +19,6 @@
 $userId    = $user->get('id');
 $listOrder = str_replace(' ' . $this->state->get('list.direction'), '', $this->state->get('list.fullordering'));
 $listDirn  = $this->escape($this->state->get('list.direction'));
-$canOrder  = $user->authorise('core.edit.state', 'com_content.article');
 $saveOrder = $listOrder == 'fp.ordering';
 $columns   = 10;
 
diff --git a/administrator/components/com_menus/views/items/tmpl/default.php b/administrator/components/com_menus/views/items/tmpl/default.php
index 09c5a7d2c481b..4e1cdbb13baa6 100644
--- a/administrator/components/com_menus/views/items/tmpl/default.php
+++ b/administrator/components/com_menus/views/items/tmpl/default.php
@@ -22,7 +22,6 @@
 $listOrder  = $this->escape($this->state->get('list.ordering'));
 $listDirn   = $this->escape($this->state->get('list.direction'));
 $ordering   = ($listOrder == 'a.lft');
-$canOrder   = $user->authorise('core.edit.state',	'com_menus');
 $saveOrder  = ($listOrder == 'a.lft' && strtolower($listDirn) == 'asc');
 $menuType   = (string) $app->getUserState('com_menus.items.menutype', '', 'string');
 
diff --git a/administrator/components/com_newsfeeds/views/newsfeeds/tmpl/default.php b/administrator/components/com_newsfeeds/views/newsfeeds/tmpl/default.php
index 301af16ffb89f..c16b074672b62 100644
--- a/administrator/components/com_newsfeeds/views/newsfeeds/tmpl/default.php
+++ b/administrator/components/com_newsfeeds/views/newsfeeds/tmpl/default.php
@@ -19,7 +19,6 @@
 $user      = JFactory::getUser();
 $listOrder = $this->escape($this->state->get('list.ordering'));
 $listDirn  = $this->escape($this->state->get('list.direction'));
-$canOrder  = $user->authorise('core.edit.state', 'com_newsfeeds.category');
 $saveOrder = $listOrder == 'a.ordering';
 $assoc     = JLanguageAssociations::isEnabled();
 
diff --git a/administrator/components/com_plugins/views/plugins/tmpl/default.php b/administrator/components/com_plugins/views/plugins/tmpl/default.php
index 05d77ccbac543..81b43df543c71 100644
--- a/administrator/components/com_plugins/views/plugins/tmpl/default.php
+++ b/administrator/components/com_plugins/views/plugins/tmpl/default.php
@@ -19,7 +19,6 @@
 $user      = JFactory::getUser();
 $listOrder = $this->escape($this->state->get('list.ordering'));
 $listDirn  = $this->escape($this->state->get('list.direction'));
-$canOrder  = $user->authorise('core.edit.state', 'com_plugins');
 $saveOrder = $listOrder == 'ordering';
 
 if ($saveOrder)
diff --git a/administrator/components/com_tags/views/tags/tmpl/default.php b/administrator/components/com_tags/views/tags/tmpl/default.php
index 4fda0ed2487a5..46623a019a7d8 100644
--- a/administrator/components/com_tags/views/tags/tmpl/default.php
+++ b/administrator/components/com_tags/views/tags/tmpl/default.php
@@ -23,7 +23,6 @@
 $userId    = $user->get('id');
 $listOrder = $this->escape($this->state->get('list.ordering'));
 $listDirn  = $this->escape($this->state->get('list.direction'));
-$canOrder  = $user->authorise('core.edit.state', 'com_tags');
 $saveOrder = ($listOrder == 'a.lft' && strtolower($listDirn) == 'asc');
 $extension = $this->escape($this->state->get('filter.extension'));
 $parts     = explode('.', $extension);
diff --git a/administrator/components/com_users/views/levels/tmpl/default.php b/administrator/components/com_users/views/levels/tmpl/default.php
index 5e930b933c302..365d1a3389088 100644
--- a/administrator/components/com_users/views/levels/tmpl/default.php
+++ b/administrator/components/com_users/views/levels/tmpl/default.php
@@ -19,7 +19,6 @@
 $user       = JFactory::getUser();
 $listOrder  = $this->escape($this->state->get('list.ordering'));
 $listDirn   = $this->escape($this->state->get('list.direction'));
-$canOrder   = $user->authorise('core.edit.state', 'com_users');
 $saveOrder  = $listOrder == 'a.ordering';
 
 if ($saveOrder)
diff --git a/administrator/templates/hathor/html/com_banners/banners/default.php b/administrator/templates/hathor/html/com_banners/banners/default.php
index 5692585b9b2aa..4c516d8682114 100644
--- a/administrator/templates/hathor/html/com_banners/banners/default.php
+++ b/administrator/templates/hathor/html/com_banners/banners/default.php
@@ -17,7 +17,7 @@
 $userId    = $user->get('id');
 $listOrder = $this->escape($this->state->get('list.ordering'));
 $listDirn  = $this->escape($this->state->get('list.direction'));
-$canOrder  = $user->authorise('core.edit.state', 'com_banners.category');
+$canOrder  = $user->authorise('core.edit.state', 'com_banners');
 $saveOrder = $listOrder == 'ordering';
 ?>
 <form action="<?php echo JRoute::_('index.php?option=com_banners&view=banners'); ?>" method="post" name="adminForm" id="adminForm">
diff --git a/administrator/templates/hathor/html/com_categories/categories/default.php b/administrator/templates/hathor/html/com_categories/categories/default.php
index 197eb40551072..2d6a3a547dfbc 100644
--- a/administrator/templates/hathor/html/com_categories/categories/default.php
+++ b/administrator/templates/hathor/html/com_categories/categories/default.php
@@ -21,6 +21,7 @@
 $listOrder = $this->escape($this->state->get('list.ordering'));
 $listDirn  = $this->escape($this->state->get('list.direction'));
 $ordering  = ($listOrder == 'a.lft');
+$canOrder  = $user->authorise('core.edit.state', $extension);
 $saveOrder = ($listOrder == 'a.lft' && $listDirn == 'asc');
 $jinput    = JFactory::getApplication()->input;
 $component = $jinput->get('extension');
@@ -95,7 +96,7 @@
 						</th>
 						<th class="nowrap ordering-col">
 							<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_ORDERING', 'a.lft', $listDirn, $listOrder); ?>
-							<?php if ($saveOrder) : ?>
+							<?php if ($canOrder && $saveOrder) : ?>
 								<?php echo JHtml::_('grid.order', $this->items, 'filesave.png', 'categories.saveorder'); ?>
 							<?php endif; ?>
 						</th>
@@ -146,9 +147,9 @@
 						$canChange = $user->authorise('core.edit.state', $extension . '.category.' . $item->id) && $canCheckin;
 						?>
 						<tr class="row<?php echo $i % 2; ?>">
-							<th class="center">
+							<td class="center">
 								<?php echo JHtml::_('grid.id', $i, $item->id); ?>
-							</th>
+							</td>
 							<td>
 								<?php echo str_repeat('<span class="gi">|&mdash;</span>', $item->level - 1) ?>
 								<?php if ($item->checked_out) : ?>
diff --git a/administrator/templates/hathor/html/com_contact/contacts/default.php b/administrator/templates/hathor/html/com_contact/contacts/default.php
index d41828189930b..c2e0cea2ff178 100644
--- a/administrator/templates/hathor/html/com_contact/contacts/default.php
+++ b/administrator/templates/hathor/html/com_contact/contacts/default.php
@@ -18,7 +18,7 @@
 $userId    = $user->get('id');
 $listOrder = $this->escape($this->state->get('list.ordering'));
 $listDirn  = $this->escape($this->state->get('list.direction'));
-$canOrder  = $user->authorise('core.edit.state', 'com_contact.category');
+$canOrder  = $user->authorise('core.edit.state', 'com_contact');
 $saveOrder = $listOrder == 'a.ordering';
 $assoc     = JLanguageAssociations::isEnabled();
 ?>
@@ -110,7 +110,7 @@
 				</th>
 				<th class="nowrap ordering-col">
 					<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_ORDERING', 'a.ordering', $listDirn, $listOrder); ?>
-					<?php if ($canOrder && $saveOrder) :?>
+					<?php if ($canOrder && $saveOrder) : ?>
 						<?php echo JHtml::_('grid.order', $this->items, 'filesave.png', 'contacts.saveorder'); ?>
 					<?php endif; ?>
 				</th>
diff --git a/administrator/templates/hathor/html/com_content/featured/default.php b/administrator/templates/hathor/html/com_content/featured/default.php
index dc7420642d252..9bb879e82010d 100644
--- a/administrator/templates/hathor/html/com_content/featured/default.php
+++ b/administrator/templates/hathor/html/com_content/featured/default.php
@@ -17,7 +17,7 @@
 $user      = JFactory::getUser();
 $listOrder = $this->escape($this->state->get('list.ordering'));
 $listDirn  = $this->escape($this->state->get('list.direction'));
-$canOrder  = $user->authorise('core.edit.state', 'com_content.article');
+$canOrder  = $user->authorise('core.edit.state', 'com_content');
 $saveOrder = $listOrder == 'fp.ordering';
 $n         = count($this->items);
 ?>
@@ -94,7 +94,7 @@
 				</th>
 				<th class="nowrap ordering-col">
 					<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_ORDERING', 'fp.ordering', $listDirn, $listOrder); ?>
-					<?php if ($canOrder && $saveOrder) :?>
+					<?php if ($canOrder && $saveOrder) : ?>
 						<?php echo JHtml::_('grid.order', $this->items, 'filesave.png', 'featured.saveorder'); ?>
 					<?php endif; ?>
 				</th>
diff --git a/administrator/templates/hathor/html/com_languages/languages/default.php b/administrator/templates/hathor/html/com_languages/languages/default.php
index 537e0dc701109..00df30ad21427 100644
--- a/administrator/templates/hathor/html/com_languages/languages/default.php
+++ b/administrator/templates/hathor/html/com_languages/languages/default.php
@@ -80,8 +80,8 @@
 					<?php echo JHtml::_('grid.sort', 'JSTATUS', 'a.published', $listDirn, $listOrder); ?>
 				</th>
 				<th width="nowrap ordering-col">
-					<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_ORDERING', 'ordering', $listDirn, $listOrder); ?>
-					<?php if ($canOrder && $saveOrder) :?>
+					<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_ORDERING', 'a.ordering', $listDirn, $listOrder); ?>
+					<?php if ($canOrder && $saveOrder) : ?>
 						<?php echo JHtml::_('grid.order', $this->items, 'filesave.png', 'languages.saveorder'); ?>
 					<?php endif; ?>
 				</th>
diff --git a/administrator/templates/hathor/html/com_menus/items/default.php b/administrator/templates/hathor/html/com_menus/items/default.php
index f9581265ad92c..71ea63b40585d 100644
--- a/administrator/templates/hathor/html/com_menus/items/default.php
+++ b/administrator/templates/hathor/html/com_menus/items/default.php
@@ -20,7 +20,7 @@
 $listOrder = $this->escape($this->state->get('list.ordering'));
 $listDirn  = $this->escape($this->state->get('list.direction'));
 $ordering  = ($listOrder == 'a.lft');
-$canOrder  = $user->authorise('core.edit.state',	'com_menus');
+$canOrder  = $user->authorise('core.edit.state', 'com_menus');
 $saveOrder = ($listOrder == 'a.lft' && $listDirn == 'asc');
 $menutypeid	= (int) $this->state->get('menutypeid');
 $assoc     = JLanguageAssociations::isEnabled();
@@ -60,7 +60,7 @@
 				<?php echo JHtml::_('select.options', $this->f_levels, 'value', 'text', $this->state->get('filter.level'));?>
 			</select>
 
-            <label class="selectlabel" for="filter_published">
+            		<label class="selectlabel" for="filter_published">
 				<?php echo JText::_('JOPTION_SELECT_PUBLISHED'); ?>
 			</label>
 			<select name="filter_published" id="filter_published">
@@ -68,7 +68,7 @@
 				<?php echo JHtml::_('select.options', JHtml::_('jgrid.publishedOptions', array('archived' => false)), 'value', 'text', $this->state->get('filter.published'), true);?>
 			</select>
 
-            <label class="selectlabel" for="filter_access">
+            		<label class="selectlabel" for="filter_access">
 				<?php echo JText::_('JOPTION_SELECT_ACCESS'); ?>
 			</label>
 			<select name="filter_access" id="filter_access">
@@ -104,7 +104,7 @@
 				</th>
 				<th class="nowrap ordering-col">
 					<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_ORDERING', 'a.lft', $listDirn, $listOrder); ?>
-					<?php if ($canOrder && $saveOrder) :?>
+					<?php if ($canOrder && $saveOrder) : ?>
 						<?php echo JHtml::_('grid.order', $this->items, 'filesave.png', 'items.saveorder'); ?>
 					<?php endif; ?>
 				</th>
@@ -117,9 +117,7 @@
 				<th class="home-col">
 					<?php echo JHtml::_('grid.sort', 'COM_MENUS_HEADING_HOME', 'a.home', $listDirn, $listOrder); ?>
 				</th>
-				<?php
-				if ($assoc):
-				?>
+				<?php if ($assoc) : ?>
 				<th class="width-5">
 					<?php echo JHtml::_('grid.sort', 'COM_MENUS_HEADING_ASSOCIATION', 'association', $listDirn, $listOrder); ?>
 				</th>
diff --git a/administrator/templates/hathor/html/com_modules/modules/default.php b/administrator/templates/hathor/html/com_modules/modules/default.php
index ee0cfb78fbfbd..b26e7467ecf27 100644
--- a/administrator/templates/hathor/html/com_modules/modules/default.php
+++ b/administrator/templates/hathor/html/com_modules/modules/default.php
@@ -113,7 +113,7 @@
 				</th>
 				<th class="nowrap ordering-col">
 					<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_ORDERING', 'ordering', $listDirn, $listOrder); ?>
-					<?php if ($canOrder && $saveOrder) :?>
+					<?php if ($canOrder && $saveOrder) : ?>
 						<?php echo JHtml::_('grid.order', $this->items, 'filesave.png', 'modules.saveorder'); ?>
 					<?php endif; ?>
 				</th>
diff --git a/administrator/templates/hathor/html/com_newsfeeds/newsfeeds/default.php b/administrator/templates/hathor/html/com_newsfeeds/newsfeeds/default.php
index 4a1d09e47d0b3..c74c3c788eb73 100644
--- a/administrator/templates/hathor/html/com_newsfeeds/newsfeeds/default.php
+++ b/administrator/templates/hathor/html/com_newsfeeds/newsfeeds/default.php
@@ -19,7 +19,7 @@
 $userId    = $user->get('id');
 $listOrder = $this->escape($this->state->get('list.ordering'));
 $listDirn  = $this->escape($this->state->get('list.direction'));
-$canOrder  = $user->authorise('core.edit.state', 'com_newsfeeds.category');
+$canOrder  = $user->authorise('core.edit.state', 'com_newsfeeds');
 $saveOrder = $listOrder == 'a.ordering';
 $assoc     = JLanguageAssociations::isEnabled();
 ?>
@@ -106,7 +106,7 @@
 				</th>
 				<th class="nowrap ordering-col">
 					<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_ORDERING', 'a.ordering', $listDirn, $listOrder); ?>
-					<?php if ($canOrder && $saveOrder) :?>
+					<?php if ($canOrder && $saveOrder) : ?>
 						<?php echo JHtml::_('grid.order', $this->items, 'filesave.png', 'newsfeeds.saveorder'); ?>
 					<?php endif; ?>
 				</th>
diff --git a/administrator/templates/hathor/html/com_plugins/plugins/default.php b/administrator/templates/hathor/html/com_plugins/plugins/default.php
index 5c7f660d4d064..bfd6912291a57 100644
--- a/administrator/templates/hathor/html/com_plugins/plugins/default.php
+++ b/administrator/templates/hathor/html/com_plugins/plugins/default.php
@@ -54,7 +54,7 @@
 				<option value=""><?php echo JText::_('COM_PLUGINS_OPTION_FOLDER');?></option>
 				<?php echo JHtml::_('select.options', PluginsHelper::folderOptions(), 'value', 'text', $this->state->get('filter.folder'));?>
 			</select>
-            <label class="selectlabel" for="filter_access">
+            		<label class="selectlabel" for="filter_access">
 				<?php echo JText::_('JOPTION_SELECT_ACCESS'); ?>
 			</label>
 			<select name="filter_access" id="filter_access">
@@ -82,7 +82,7 @@
 				</th>
 				<th class="nowrap ordering-col">
 					<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_ORDERING', 'ordering', $listDirn, $listOrder); ?>
-					<?php if ($canOrder && $saveOrder) :?>
+					<?php if ($canOrder && $saveOrder) : ?>
 						<?php echo JHtml::_('grid.order', $this->items, 'filesave.png', 'plugins.saveorder'); ?>
 					<?php endif; ?>
 				</th>
@@ -93,7 +93,7 @@
 				<th class="nowrap width-10">
 					<?php echo JHtml::_('grid.sort', 'COM_PLUGINS_ELEMENT_HEADING', 'element', $listDirn, $listOrder); ?>
 				</th>
-                <th class="title access-col">
+                		<th class="title access-col">
 					<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_ACCESS', 'access', $listDirn, $listOrder); ?>
 				</th>
 				<th class="nowrap id-col">
diff --git a/administrator/templates/hathor/html/com_users/levels/default.php b/administrator/templates/hathor/html/com_users/levels/default.php
index 5ec7822cdc87f..bd309fed254ce 100644
--- a/administrator/templates/hathor/html/com_users/levels/default.php
+++ b/administrator/templates/hathor/html/com_users/levels/default.php
@@ -52,7 +52,7 @@
 				</th>
 				<th class="nowrap ordering-col">
 					<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_ORDERING', 'a.ordering', $listDirn, $listOrder); ?>
-					<?php if ($canOrder && $saveOrder) :?>
+					<?php if ($canOrder && $saveOrder) : ?>
 						<?php echo JHtml::_('grid.order', $this->items, 'filesave.png', 'levels.saveorder'); ?>
 					<?php endif; ?>
 				</th>
diff --git a/administrator/templates/hathor/html/com_weblinks/weblinks/default.php b/administrator/templates/hathor/html/com_weblinks/weblinks/default.php
index cbbc87030e2de..938bf27ad6253 100644
--- a/administrator/templates/hathor/html/com_weblinks/weblinks/default.php
+++ b/administrator/templates/hathor/html/com_weblinks/weblinks/default.php
@@ -18,7 +18,7 @@
 $userId    = $user->get('id');
 $listOrder = $this->escape($this->state->get('list.ordering'));
 $listDirn  = $this->escape($this->state->get('list.direction'));
-$canOrder  = $user->authorise('core.edit.state', 'com_weblinks.category');
+$canOrder  = $user->authorise('core.edit.state', 'com_weblinks');
 $saveOrder = $listOrder == 'a.ordering';
 ?>
 
@@ -57,7 +57,7 @@
 				<?php echo JHtml::_('select.options', JHtml::_('category.options', 'com_weblinks'), 'value', 'text', $this->state->get('filter.category_id'));?>
 			</select>
 
-            <label class="selectlabel" for="filter_access">
+            		<label class="selectlabel" for="filter_access">
 				<?php echo JText::_('JOPTION_SELECT_ACCESS'); ?>
 			</label>
 			<select name="filter_access" id="filter_access">
@@ -104,7 +104,7 @@
 				</th>
 				<th class="nowrap ordering-col">
 					<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_ORDERING', 'a.ordering', $listDirn, $listOrder); ?>
-					<?php if ($canOrder && $saveOrder) :?>
+					<?php if ($canOrder && $saveOrder) : ?>
 						<?php echo JHtml::_('grid.order', $this->items, 'filesave.png', 'weblinks.saveorder'); ?>
 					<?php endif; ?>
 				</th>

From 20e970915276659f317e26eefbbd6797dd9ef959 Mon Sep 17 00:00:00 2001
From: Roberto Segura <roberto@phproberto.com>
Date: Tue, 6 Dec 2016 23:12:28 +0100
Subject: [PATCH 13/39] [fix] undefined group path when ordering items by
 title. Fixes #12903 (#12904)

---
 libraries/cms/helper/usergroups.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/libraries/cms/helper/usergroups.php b/libraries/cms/helper/usergroups.php
index 04de03ddec315..828b2c24c27ae 100644
--- a/libraries/cms/helper/usergroups.php
+++ b/libraries/cms/helper/usergroups.php
@@ -308,6 +308,11 @@ public function populateGroupData($group)
 
 		$parentGroup = $this->has($parentId) ? $this->get($parentId) : $this->load($parentId);
 
+		if (!property_exists($parentGroup, 'path'))
+		{
+			$parentGroup = $this->populateGroupData($parentGroup);
+		}
+
 		$group->path = array_merge($parentGroup->path, array($group->id));
 		$group->level = count($group->path) - 1;
 

From 75c2dc73c0c404006ba8ba6a4189392c3d341fac Mon Sep 17 00:00:00 2001
From: andrepereiradasilva <andrepereiradasilva@users.noreply.github.com>
Date: Tue, 6 Dec 2016 22:12:51 +0000
Subject: [PATCH 14/39] [Regression] Clean cache of installed language query on
 language extension install/update/remove (#12906)

* do not cache to file language info

* add back the cache to getInstalledLanguages

* clean the com_languages cache on language install, remove, update and discover install

* readd content languages cache

* cs
---
 libraries/cms/installer/adapter/language.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/libraries/cms/installer/adapter/language.php b/libraries/cms/installer/adapter/language.php
index db63f82fd3509..64585ab18ea92 100644
--- a/libraries/cms/installer/adapter/language.php
+++ b/libraries/cms/installer/adapter/language.php
@@ -381,6 +381,9 @@ protected function _install($cname, $basePath, $clientId, &$element)
 			$update->delete($uid);
 		}
 
+		// Clean installed languages cache.
+		JFactory::getCache()->clean('com_languages');
+
 		return $row->get('extension_id');
 	}
 
@@ -558,6 +561,9 @@ public function update()
 		$row->set('element', $this->get('tag'));
 		$row->set('manifest_cache', $this->parent->generateManifestCache());
 
+		// Clean installed languages cache.
+		JFactory::getCache()->clean('com_languages');
+
 		if (!$row->store())
 		{
 			// Install failed, roll back changes
@@ -685,6 +691,9 @@ public function uninstall($eid)
 			}
 		}
 
+		// Clean installed languages cache.
+		JFactory::getCache()->clean('com_languages');
+
 		if (!empty($count))
 		{
 			JLog::add(JText::plural('JLIB_INSTALLER_NOTICE_LANG_RESET_USERS', $count), JLog::NOTICE, 'jerror');
@@ -783,6 +792,9 @@ public function discover_install()
 			return false;
 		}
 
+		// Clean installed languages cache.
+		JFactory::getCache()->clean('com_languages');
+
 		return $this->parent->extension->get('extension_id');
 	}
 

From 5defabbed2ef7aeb827ee2945e4b7f400ac53678 Mon Sep 17 00:00:00 2001
From: Thomas Hunziker <werbemails@bakual.ch>
Date: Tue, 6 Dec 2016 23:13:55 +0100
Subject: [PATCH 15/39] JFormFieldUser now shows stored user ID if user is not
 found (#12908)

* JFormFieldUser now shows stored user ID if user is not found

* Take care of User ID 0 (not saved yet)
---
 libraries/cms/form/field/user.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/libraries/cms/form/field/user.php b/libraries/cms/form/field/user.php
index 008165d79718f..730f6df047155 100644
--- a/libraries/cms/form/field/user.php
+++ b/libraries/cms/form/field/user.php
@@ -94,6 +94,12 @@ public function getLayoutData()
 			$name = JText::_('JLIB_FORM_SELECT_USER');
 		}
 
+		// User lookup went wrong, we assign the value instead.
+		if ($name === null && $this->value)
+		{
+			$name = $this->value;
+		}
+
 		$extraData = array(
 				'userName'  => $name,
 				'groups'    => $this->getGroups(),

From 61e4e319fcac5c7c9dfd080e2a55bababcc6ff6a Mon Sep 17 00:00:00 2001
From: andrepereiradasilva <andrepereiradasilva@users.noreply.github.com>
Date: Tue, 6 Dec 2016 22:14:55 +0000
Subject: [PATCH 16/39] add useglobal to com_menus text options (#12911)

---
 .../com_menus/models/forms/item_component.xml | 40 ++++++++++++-------
 1 file changed, 25 insertions(+), 15 deletions(-)

diff --git a/administrator/components/com_menus/models/forms/item_component.xml b/administrator/components/com_menus/models/forms/item_component.xml
index 43198e4d391b1..3c6541b86d815 100644
--- a/administrator/components/com_menus/models/forms/item_component.xml
+++ b/administrator/components/com_menus/models/forms/item_component.xml
@@ -41,34 +41,44 @@
 			</field>
 		</fieldset>
 
-		<fieldset name="page-options"
-			label="COM_MENUS_PAGE_OPTIONS_LABEL"
-		>
-
+		<fieldset name="page-options" label="COM_MENUS_PAGE_OPTIONS_LABEL">
 
-			<field name="page_title" type="text"
+			<field
+				name="page_title"
+				type="text"
 				label="COM_MENUS_ITEM_FIELD_PAGE_TITLE_LABEL"
-				description="COM_MENUS_ITEM_FIELD_PAGE_TITLE_DESC" />
+				description="COM_MENUS_ITEM_FIELD_PAGE_TITLE_DESC"
+				useglobal="true"
+			/>
 
-			<field name="show_page_heading" type="list"
-				class="chzn-color"
+			<field
+				name="show_page_heading"
+				type="list"
 				label="COM_MENUS_ITEM_FIELD_SHOW_PAGE_HEADING_LABEL"
 				description="COM_MENUS_ITEM_FIELD_SHOW_PAGE_HEADING_DESC"
+				class="chzn-color"
 				default=""
 				useglobal="true"
 				>
-				<option value="1" class="yes">JYES</option>
-				<option value="0" class="no">JNO</option>
+				<option value="1">JYES</option>
+				<option value="0">JNO</option>
 			</field>
 
-			<field name="page_heading" type="text"
+			<field
+				name="page_heading"
+				type="text"
 				label="COM_MENUS_ITEM_FIELD_PAGE_HEADING_LABEL"
-				description="COM_MENUS_ITEM_FIELD_PAGE_HEADING_DESC" />
+				description="COM_MENUS_ITEM_FIELD_PAGE_HEADING_DESC"
+				useglobal="true"
+			/>
 
-			<field name="pageclass_sfx" type="text"
+			<field
+				name="pageclass_sfx"
+				type="text"
 				label="COM_MENUS_ITEM_FIELD_PAGE_CLASS_LABEL"
-				description="COM_MENUS_ITEM_FIELD_PAGE_CLASS_DESC" />
-
+				description="COM_MENUS_ITEM_FIELD_PAGE_CLASS_DESC"
+				useglobal="true"
+			/>
 
 		</fieldset>
 

From fd1af5d57943671e93ad7851bfa5459cbec257dd Mon Sep 17 00:00:00 2001
From: andrepereiradasilva <andrepereiradasilva@users.noreply.github.com>
Date: Tue, 6 Dec 2016 22:15:16 +0000
Subject: [PATCH 17/39] [com_finder] Add useglobal to "Search" menu item type
 (#12916)

* com_finder: use global

* Update default.xml
---
 .../com_finder/views/search/tmpl/default.xml  | 171 ++++++++++--------
 1 file changed, 100 insertions(+), 71 deletions(-)

diff --git a/components/com_finder/views/search/tmpl/default.xml b/components/com_finder/views/search/tmpl/default.xml
index ce5a6784a579d..550418d94d17a 100644
--- a/components/com_finder/views/search/tmpl/default.xml
+++ b/components/com_finder/views/search/tmpl/default.xml
@@ -11,187 +11,216 @@
 
 	<fields name="request" addfieldpath="/administrator/components/com_finder/models/fields">
 		<fieldset name="request">
-			<field name="q"
+			<field
+				name="q"
 				type="text"
 				label="COM_FINDER_SEARCH_SEARCH_QUERY_LABEL"
 				description="COM_FINDER_SEARCH_SEARCH_QUERY_DESC"
 				size="30"
 			/>
-			<field name="f"
+			<field
+				name="f"
 				type="searchfilter"
-				default=""
 				label="COM_FINDER_SEARCH_FILTER_SEARCH_LABEL"
 				description="COM_FINDER_SEARCH_FILTER_SEARCH_DESC"
+				default=""
 			/>
 		</fieldset>
 	</fields>
 	<fields name="params" addfieldpath="/administrator/components/com_finder/models/fields">
 		<fieldset name="basic">
-			<field name="show_date_filters"
+			<field
+				name="show_date_filters"
 				type="list"
-				default=""
-				validate="options"
 				label="COM_FINDER_CONFIG_SHOW_DATE_FILTERS_LABEL"
-				description="COM_FINDER_CONFIG_SHOW_DATE_FILTERS_DESC">
+				description="COM_FINDER_CONFIG_SHOW_DATE_FILTERS_DESC"
+				default=""
+				useglobal="true"
+				>
 				<option value="1">JSHOW</option>
 				<option value="0">JHIDE</option>
-				<option value="">JGLOBAL_USE_GLOBAL</option>
 			</field>
-			<field name="show_advanced"
+			<field
+				name="show_advanced"
 				type="list"
-				default=""
-				validate="options"
 				label="COM_FINDER_CONFIG_SHOW_ADVANCED_LABEL"
-				description="COM_FINDER_CONFIG_SHOW_ADVANCED_DESC">
+				description="COM_FINDER_CONFIG_SHOW_ADVANCED_DESC"
+				default=""
+				useglobal="true"
+				>
 				<option value="1">JSHOW</option>
 				<option value="0">JHIDE</option>
-				<option value="">JGLOBAL_USE_GLOBAL</option>
 			</field>
-			<field name="expand_advanced"
+			<field
+				name="expand_advanced"
 				type="list"
-				default=""
-				validate="options"
 				label="COM_FINDER_CONFIG_EXPAND_ADVANCED_LABEL"
-				description="COM_FINDER_CONFIG_EXPAND_ADVANCED_DESC">
+				description="COM_FINDER_CONFIG_EXPAND_ADVANCED_DESC"
+				default=""
+				useglobal="true"
+				>
 				<option value="1">JSHOW</option>
 				<option value="0">JHIDE</option>
-				<option value="">JGLOBAL_USE_GLOBAL</option>
 			</field>
 			<field type="spacer" />
-			<field name="show_description"
+			<field
+				name="show_description"
 				type="list"
-				default=""
-				validate="options"
 				label="COM_FINDER_CONFIG_SHOW_DESCRIPTION_LABEL"
-				description="COM_FINDER_CONFIG_SHOW_DESCRIPTION_DESC">
+				description="COM_FINDER_CONFIG_SHOW_DESCRIPTION_DESC"
+				default=""
+				useglobal="true"
+				>
 				<option value="1">JSHOW</option>
 				<option value="0">JHIDE</option>
-				<option value="">JGLOBAL_USE_GLOBAL</option>
 			</field>
-			<field name="description_length"
+			<field
+				name="description_length"
 				type="text"
-				default="255"
-				filter="integer"
 				label="COM_FINDER_CONFIG_DESCRIPTION_LENGTH_LABEL"
 				description="COM_FINDER_CONFIG_DESCRIPTION_LENGTH_DESC"
+				default=""
 				size="5"
+				useglobal="true"
 			/>
-			<field name="show_url"
+			<field
+				name="show_url"
 				type="list"
-				default=""
-				validate="options"
 				label="COM_FINDER_CONFIG_SHOW_URL_LABEL"
-				description="COM_FINDER_CONFIG_SHOW_URL_DESC">
+				description="COM_FINDER_CONFIG_SHOW_URL_DESC"
+				default=""
+				useglobal="true"
+				>
 				<option value="1">JSHOW</option>
 				<option value="0">JHIDE</option>
-				<option value="">JGLOBAL_USE_GLOBAL</option>
 			</field>
 			<field type="spacer" />
 		</fieldset>
 		<fieldset name="advanced">
-			<field name="show_pagination_limit" type="list"
+			<field
+				name="show_pagination_limit"
+				type="list"
 				label="JGLOBAL_DISPLAY_SELECT_LABEL"
+				description="JGLOBAL_DISPLAY_SELECT_DESC"
 				validate="options"
-				description="JGLOBAL_DISPLAY_SELECT_DESC">
+				>
 				<option value="">JGLOBAL_USE_GLOBAL</option>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
 			</field>
-			<field name="show_pagination" type="list"
+			<field
+				name="show_pagination"
+				type="list"
+				label="JGLOBAL_PAGINATION_LABEL"
 				description="JGLOBAL_PAGINATION_DESC"
 				validate="options"
-				label="JGLOBAL_PAGINATION_LABEL" >
+				>
 				<option value="">JGLOBAL_USE_GLOBAL</option>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
 				<option value="2">JGLOBAL_AUTO</option>
 			</field>
-			<field name="show_pagination_results" type="list"
+			<field
+				name="show_pagination_results"
+				type="list"
 				label="JGLOBAL_PAGINATION_RESULTS_LABEL"
+				description="JGLOBAL_PAGINATION_RESULTS_DESC"
 				validate="options"
-				description="JGLOBAL_PAGINATION_RESULTS_DESC" >
+				>
 				<option value="">JGLOBAL_USE_GLOBAL</option>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
 			</field>
-			<field name="allow_empty_query"
-				type="radio"
-				class="btn-group btn-group-yesno"
-				default="0"
-				validate="options"
+			<field
+				name="allow_empty_query"
+				type="list"
 				label="COM_FINDER_ALLOW_EMPTY_QUERY_LABEL"
-				description="COM_FINDER_ALLOW_EMPTY_QUERY_DESC">
+				description="COM_FINDER_ALLOW_EMPTY_QUERY_DESC"
+				default=""
+				useglobal="true"
+				>
 				<option value="1">JYES</option>
 				<option value="0">JNO</option>
 			</field>
-			<field name="show_suggested_query"
+			<field
+				name="show_suggested_query"
 				type="list"
-				default=""
-				validate="options"
 				label="COM_FINDER_CONFIG_SHOW_SUGGESTED_QUERY_LABEL"
-				description="COM_FINDER_CONFIG_SHOW_SUGGESTED_QUERY_DESC">
-				<option value="">JGLOBAL_USE_GLOBAL</option>
+				description="COM_FINDER_CONFIG_SHOW_SUGGESTED_QUERY_DESC"
+				default=""
+				useglobal="true"
+				>
 				<option value="1">JYES</option>
 				<option value="0">JNO</option>
 			</field>
-			<field name="show_explained_query"
+			<field
+				name="show_explained_query"
 				type="list"
-				default=""
-				validate="options"
 				label="COM_FINDER_CONFIG_SHOW_EXPLAINED_QUERY_LABEL"
-				description="COM_FINDER_CONFIG_SHOW_EXPLAINED_QUERY_DESC">
-				<option value="">JGLOBAL_USE_GLOBAL</option>
+				description="COM_FINDER_CONFIG_SHOW_EXPLAINED_QUERY_DESC"
+				default=""
+				useglobal="true"
+				>
 				<option value="1">JYES</option>
 				<option value="0">JNO</option>
 			</field>
-			<field name="sort_order"
+			<field
+				name="sort_order"
 				type="list"
-				default=""
-				validate="options"
 				label="COM_FINDER_CONFIG_SORT_ORDER_LABEL"
-				description="COM_FINDER_CONFIG_SORT_ORDER_DESC">
-				<option value="">JGLOBAL_USE_GLOBAL</option>
+				description="COM_FINDER_CONFIG_SORT_ORDER_DESC"
+				default=""
+				useglobal="true"
+				>
 				<option value="relevance">COM_FINDER_CONFIG_SORT_OPTION_RELEVANCE</option>
 				<option value="date">COM_FINDER_CONFIG_SORT_OPTION_START_DATE</option>
 				<option value="price">COM_FINDER_CONFIG_SORT_OPTION_LIST_PRICE</option>
 			</field>
-			<field name="sort_direction"
+			<field
+				name="sort_direction"
 				type="list"
-				default=""
-				validate="options"
 				label="COM_FINDER_CONFIG_SORT_DIRECTION_LABEL"
-				description="COM_FINDER_CONFIG_SORT_DIRECTION_DESC">
-				<option value="">JGLOBAL_USE_GLOBAL</option>
+				description="COM_FINDER_CONFIG_SORT_DIRECTION_DESC"
+				default=""
+				useglobal="true"
+				>
 				<option value="desc">COM_FINDER_CONFIG_SORT_OPTION_DESCENDING</option>
 				<option value="asc">COM_FINDER_CONFIG_SORT_OPTION_ASCENDING</option>
 			</field>
 			<field type="spacer" />
-			<field name="show_feed"
+			<field
+				name="show_feed"
 				type="radio"
+				label="COM_FINDER_CONFIG_SHOW_FEED_LABEL"
+				description="COM_FINDER_CONFIG_SHOW_FEED_DESC"
 				class="btn-group btn-group-yesno"
 				default="0"
 				validate="options"
-				label="COM_FINDER_CONFIG_SHOW_FEED_LABEL"
-				description="COM_FINDER_CONFIG_SHOW_FEED_DESC">
+				>
 				<option value="1">JSHOW</option>
 				<option value="0">JHIDE</option>
 			</field>
-			<field name="show_feed_text"
+			<field
+				name="show_feed_text"
 				type="radio"
+				label="COM_FINDER_CONFIG_SHOW_FEED_TEXT_LABEL"
+				description="COM_FINDER_CONFIG_SHOW_FEED_TEXT_DESC"
 				class="btn-group btn-group-yesno"
 				default="0"
 				validate="options"
-				label="COM_FINDER_CONFIG_SHOW_FEED_TEXT_LABEL"
-				description="COM_FINDER_CONFIG_SHOW_FEED_TEXT_DESC">
+				>
 				<option value="1">JYES</option>
 				<option value="0">JNO</option>
 			</field>
 		</fieldset>
 		<fieldset name="integration">
-			<field name="show_feed_link" type="list"
+			<field
+				name="show_feed_link"
+				type="list"
+				label="JGLOBAL_SHOW_FEED_LINK_LABEL"
 				description="JGLOBAL_SHOW_FEED_LINK_DESC"
 				validate="options"
-				label="JGLOBAL_SHOW_FEED_LINK_LABEL" >
+				>
 				<option value="">JGLOBAL_USE_GLOBAL</option>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>

From 1ae880154c57d4ebeeaf080ef98660ec6791e993 Mon Sep 17 00:00:00 2001
From: Brian Teeman <brian@teeman.net>
Date: Tue, 6 Dec 2016 22:15:44 +0000
Subject: [PATCH 18/39] Hathor fails to detect disabled modules (redo) (#12925)

---
 .../html/com_modules/modules/default.php       | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/administrator/templates/hathor/html/com_modules/modules/default.php b/administrator/templates/hathor/html/com_modules/modules/default.php
index b26e7467ecf27..1369861870136 100644
--- a/administrator/templates/hathor/html/com_modules/modules/default.php
+++ b/administrator/templates/hathor/html/com_modules/modules/default.php
@@ -163,7 +163,15 @@
 					<?php endif; ?>
 				</td>
 				<td class="center">
-					<?php echo JHtml::_('modules.state', $item->published, $i, $canChange, 'cb'); ?>
+					<?php // Check if extension is enabled ?>
+					<?php if ($item->enabled > 0) : ?>
+						<?php echo JHtml::_('modules.state', $item->published, $i, $canChange, 'cb'); ?>
+					<?php else : ?>
+						<?php // Extension is not enabled, show a message that indicates this. ?>
+							<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; ?>					
 				</td>
 				<td class="center">
 					<?php echo $item->position; ?>
@@ -196,7 +204,13 @@
 					<?php echo $this->escape($item->access_level); ?>
 				</td>
 				<td class="center">
-					<?php echo JLayoutHelper::render('joomla.content.language', $item); ?>
+					<?php if ($item->language == ''):?>
+						<?php echo JText::_('JDEFAULT'); ?>
+					<?php elseif ($item->language == '*'):?>
+						<?php echo JText::alt('JALL', 'language'); ?>
+					<?php else:?>
+						<?php echo $item->language_title ? JHtml::_('image', 'mod_languages/' . $item->language_image . '.gif', $item->language_title, array('title' => $item->language_title), true) . '&nbsp;' . $this->escape($item->language_title) : JText::_('JUNDEFINED'); ?>
+					<?php endif;?>
 				</td>
 				<td class="center">
 					<?php echo (int) $item->id; ?>

From a7a674dd96e867ef706e6616457b41ef5146f7bd Mon Sep 17 00:00:00 2001
From: Brian Teeman <brian@teeman.net>
Date: Tue, 6 Dec 2016 22:16:01 +0000
Subject: [PATCH 19/39] sync (#12937)

---
 language/en-GB/en-GB.com_media.ini | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/language/en-GB/en-GB.com_media.ini b/language/en-GB/en-GB.com_media.ini
index 5befff0ce864a..fcf3f11d7c05e 100644
--- a/language/en-GB/en-GB.com_media.ini
+++ b/language/en-GB/en-GB.com_media.ini
@@ -41,8 +41,8 @@ COM_MEDIA_FIELD_LEGAL_IMAGE_EXTENSIONS_DESC=" Image extensions (file types) you
 COM_MEDIA_FIELD_LEGAL_IMAGE_EXTENSIONS_LABEL="Legal Image Extensions (File Types)"
 COM_MEDIA_FIELD_LEGAL_MIME_TYPES_DESC="A comma separated list of legal MIME types to upload."
 COM_MEDIA_FIELD_LEGAL_MIME_TYPES_LABEL="Legal MIME Types"
-COM_MEDIA_FIELD_MAXIMUM_SIZE_DESC="The maximum size for an upload (in bytes). Use zero for no limit. Note: your server has a maximum limit."
-COM_MEDIA_FIELD_MAXIMUM_SIZE_LABEL="Maximum Size"
+COM_MEDIA_FIELD_MAXIMUM_SIZE_DESC="The maximum size for an upload (in megabytes). Use zero for no limit. Note: your server has a maximum limit."
+COM_MEDIA_FIELD_MAXIMUM_SIZE_LABEL="Maximum Size (in MB)"
 COM_MEDIA_FIELD_PATH_FILE_FOLDER_DESC="Enter the path to the file folder relative to root."
 COM_MEDIA_FIELD_PATH_FILE_FOLDER_LABEL="Path to File Folder"
 COM_MEDIA_FIELD_PATH_IMAGE_FOLDER_DESC="Enter the path to the image folder relative to root."

From 83f7e6e7f5b6b2ad467945c52c890e82ac128444 Mon Sep 17 00:00:00 2001
From: andrepereiradasilva <andrepereiradasilva@users.noreply.github.com>
Date: Tue, 6 Dec 2016 22:16:47 +0000
Subject: [PATCH 20/39] Allow two or more content language without images (PR
 for #12907) (#12949)

* change index type

* on installation

* remove extra space
---
 .../com_admin/sql/updates/mysql/3.7.0-2016-11-21.sql         | 3 +++
 .../com_admin/sql/updates/postgresql/3.7.0-2016-11-21.sql    | 3 +++
 .../com_admin/sql/updates/sqlazure/3.7.0-2016-11-21.sql      | 5 +++++
 installation/sql/mysql/joomla.sql                            | 2 +-
 installation/sql/postgresql/joomla.sql                       | 2 +-
 installation/sql/sqlazure/joomla.sql                         | 4 ++++
 6 files changed, 17 insertions(+), 2 deletions(-)
 create mode 100644 administrator/components/com_admin/sql/updates/mysql/3.7.0-2016-11-21.sql
 create mode 100644 administrator/components/com_admin/sql/updates/postgresql/3.7.0-2016-11-21.sql
 create mode 100644 administrator/components/com_admin/sql/updates/sqlazure/3.7.0-2016-11-21.sql

diff --git a/administrator/components/com_admin/sql/updates/mysql/3.7.0-2016-11-21.sql b/administrator/components/com_admin/sql/updates/mysql/3.7.0-2016-11-21.sql
new file mode 100644
index 0000000000000..44a7d921af6ef
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/mysql/3.7.0-2016-11-21.sql
@@ -0,0 +1,3 @@
+-- Replace language image UNIQUE index for a normal INDEX.
+ALTER TABLE `#__languages` DROP INDEX `idx_image`;
+ALTER TABLE `#__languages` ADD INDEX `idx_image` (`image`);
diff --git a/administrator/components/com_admin/sql/updates/postgresql/3.7.0-2016-11-21.sql b/administrator/components/com_admin/sql/updates/postgresql/3.7.0-2016-11-21.sql
new file mode 100644
index 0000000000000..556916a092f4c
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/postgresql/3.7.0-2016-11-21.sql
@@ -0,0 +1,3 @@
+-- Replace language image UNIQUE index for a normal INDEX.
+ALTER TABLE "#__languages" DROP CONSTRAINT "#__idx_image";
+CREATE INDEX "#__idx_image" ON "#__languages" ("image");
diff --git a/administrator/components/com_admin/sql/updates/sqlazure/3.7.0-2016-11-21.sql b/administrator/components/com_admin/sql/updates/sqlazure/3.7.0-2016-11-21.sql
new file mode 100644
index 0000000000000..9343ae533a62c
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/sqlazure/3.7.0-2016-11-21.sql
@@ -0,0 +1,5 @@
+-- Replace language image UNIQUE index for a normal INDEX.
+ALTER TABLE [#__languages] DROP CONSTRAINT [#__languages$idx_image];
+CREATE NONCLUSTERED INDEX [idx_image] ON [#__languages] (
+	[image] ASC
+) WITH (STATISTICS_NORECOMPUTE  = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF);
diff --git a/installation/sql/mysql/joomla.sql b/installation/sql/mysql/joomla.sql
index e32faf54078af..a3339f126c52b 100644
--- a/installation/sql/mysql/joomla.sql
+++ b/installation/sql/mysql/joomla.sql
@@ -1299,8 +1299,8 @@ CREATE TABLE IF NOT EXISTS `#__languages` (
   `ordering` int(11) NOT NULL DEFAULT 0,
   PRIMARY KEY (`lang_id`),
   UNIQUE KEY `idx_sef` (`sef`),
-  UNIQUE KEY `idx_image` (`image`),
   UNIQUE KEY `idx_langcode` (`lang_code`),
+  KEY `idx_image` (`image`),
   KEY `idx_access` (`access`),
   KEY `idx_ordering` (`ordering`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci;
diff --git a/installation/sql/postgresql/joomla.sql b/installation/sql/postgresql/joomla.sql
index a8c568a7b6547..317fe826af09e 100644
--- a/installation/sql/postgresql/joomla.sql
+++ b/installation/sql/postgresql/joomla.sql
@@ -1228,9 +1228,9 @@ CREATE TABLE "#__languages" (
   "ordering" bigint DEFAULT 0 NOT NULL,
   PRIMARY KEY ("lang_id"),
   CONSTRAINT "#__languages_idx_sef" UNIQUE ("sef"),
-  CONSTRAINT "#__languages_idx_image" UNIQUE ("image"),
   CONSTRAINT "#__languages_idx_langcode" UNIQUE ("lang_code")
 );
+CREATE INDEX "#__languages_idx_image" ON "#__languages" ("image");
 CREATE INDEX "#__languages_idx_ordering" ON "#__languages" ("ordering");
 CREATE INDEX "#__languages_idx_access" ON "#__languages" ("access");
 
diff --git a/installation/sql/sqlazure/joomla.sql b/installation/sql/sqlazure/joomla.sql
index be35af447da34..b1665a2b12bd1 100644
--- a/installation/sql/sqlazure/joomla.sql
+++ b/installation/sql/sqlazure/joomla.sql
@@ -2013,6 +2013,10 @@ CREATE UNIQUE INDEX [idx_access] ON [#__languages]
 	[access] ASC
 )WITH (STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF);
 
+CREATE NONCLUSTERED INDEX [idx_image] ON [#__languages] (
+	[image] ASC
+) WITH (STATISTICS_NORECOMPUTE  = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF);
+
 SET IDENTITY_INSERT [#__languages] ON;
 
 INSERT INTO [#__languages] ([lang_id], [lang_code], [title], [title_native], [sef], [image], [description], [metakey], [metadesc], [sitename], [published], [access], [ordering])

From cb09b52191c3d848a458dfc9d84004a0f49d41a3 Mon Sep 17 00:00:00 2001
From: andrepereiradasilva <andrepereiradasilva@users.noreply.github.com>
Date: Tue, 6 Dec 2016 22:17:04 +0000
Subject: [PATCH 21/39] use the new language layout (#12950)

---
 .../components/com_fields/views/fields/tmpl/default.php     | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/administrator/components/com_fields/views/fields/tmpl/default.php b/administrator/components/com_fields/views/fields/tmpl/default.php
index 016bb728277a2..3bd6161cc5ca2 100644
--- a/administrator/components/com_fields/views/fields/tmpl/default.php
+++ b/administrator/components/com_fields/views/fields/tmpl/default.php
@@ -178,11 +178,7 @@
 								<?php echo $this->escape($item->access_level); ?>
 							</td>
 							<td class="small nowrap hidden-phone">
-								<?php if ($item->language == '*') : ?>
-									<?php echo JText::alt('JALL', 'language'); ?>
-								<?php else : ?>
-									<?php echo $item->language_title ? JHtml::_('image', 'mod_languages/' . $item->language_image . '.gif', $item->language_title, array('title' => $item->language_title), true) . '&nbsp;' . $this->escape($item->language_title) : JText::_('JUNDEFINED'); ?>
-								<?php endif; ?>
+								<?php echo JLayoutHelper::render('joomla.content.language', $item); ?>
 							</td>
 							<td class="center hidden-phone">
 								<span><?php echo (int) $item->id; ?></span>

From 3a9f08220056d2e7e66b5db56a15a5dc109e9181 Mon Sep 17 00:00:00 2001
From: andrepereiradasilva <andrepereiradasilva@users.noreply.github.com>
Date: Tue, 6 Dec 2016 22:17:35 +0000
Subject: [PATCH 22/39] Only show Versions Button if com_contenthistory is
 enabled (#12959)

* com_content: only show versions button if com_contenthistory is enabled

* com_banners: client - only show versions button if com_contenthistory is enabled

* com_banners: banner - only show versions button if com_contenthistory is enabled

* com_newsfeed: only show versions button if com_contenthistory is enabled

* com_categories: only show versions button if com_contenthistory is enabled

* com_users: note - only show versions button if com_contenthistory is enabled

* com_contact: only show versions button if com_contenthistory is enabled

* com_tags: only show versions button if com_contenthistory is enabled
---
 administrator/components/com_banners/views/banner/view.html.php | 2 +-
 administrator/components/com_banners/views/client/view.html.php | 2 +-
 .../components/com_categories/views/category/view.html.php      | 2 +-
 .../components/com_contact/views/contact/view.html.php          | 2 +-
 .../components/com_content/views/article/view.html.php          | 2 +-
 .../components/com_newsfeeds/views/newsfeed/view.html.php       | 2 +-
 administrator/components/com_tags/views/tag/view.html.php       | 2 +-
 administrator/components/com_users/views/note/view.html.php     | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/administrator/components/com_banners/views/banner/view.html.php b/administrator/components/com_banners/views/banner/view.html.php
index 51fed3bba5bdd..84028b063b24a 100644
--- a/administrator/components/com_banners/views/banner/view.html.php
+++ b/administrator/components/com_banners/views/banner/view.html.php
@@ -111,7 +111,7 @@ protected function addToolbar()
 		}
 		else
 		{
-			if ($this->state->params->get('save_history', 0) && $canDo->get('core.edit'))
+			if (JComponentHelper::isEnabled('com_contenthistory') && $this->state->params->get('save_history', 0) && $canDo->get('core.edit'))
 			{
 				JToolbarHelper::versions('com_banners.banner', $this->item->id);
 			}
diff --git a/administrator/components/com_banners/views/client/view.html.php b/administrator/components/com_banners/views/client/view.html.php
index 3ae6d6df856df..6c019631d36ae 100644
--- a/administrator/components/com_banners/views/client/view.html.php
+++ b/administrator/components/com_banners/views/client/view.html.php
@@ -118,7 +118,7 @@ protected function addToolbar()
 		}
 		else
 		{
-			if ($this->state->params->get('save_history', 0) && $canDo->get('core.edit'))
+			if (JComponentHelper::isEnabled('com_contenthistory') && $this->state->params->get('save_history', 0) && $canDo->get('core.edit'))
 			{
 				JToolbarHelper::versions('com_banners.client', $this->item->id);
 			}
diff --git a/administrator/components/com_categories/views/category/view.html.php b/administrator/components/com_categories/views/category/view.html.php
index b96585e0aebc8..50ba74790780b 100644
--- a/administrator/components/com_categories/views/category/view.html.php
+++ b/administrator/components/com_categories/views/category/view.html.php
@@ -203,7 +203,7 @@ protected function addToolbar()
 				JToolbarHelper::save2copy('category.save2copy');
 			}
 
-			if ($componentParams->get('save_history', 0) && $itemEditable)
+			if (JComponentHelper::isEnabled('com_contenthistory') && $componentParams->get('save_history', 0) && $itemEditable)
 			{
 				$typeAlias = $extension . '.category';
 				JToolbarHelper::versions($typeAlias, $this->item->id);
diff --git a/administrator/components/com_contact/views/contact/view.html.php b/administrator/components/com_contact/views/contact/view.html.php
index f44756b53e5f8..3c2ee4ed443f5 100644
--- a/administrator/components/com_contact/views/contact/view.html.php
+++ b/administrator/components/com_contact/views/contact/view.html.php
@@ -136,7 +136,7 @@ protected function addToolbar()
 				JToolbarHelper::save2copy('contact.save2copy');
 			}
 
-			if ($this->state->params->get('save_history', 0) && $itemEditable)
+			if (JComponentHelper::isEnabled('com_contenthistory') && $this->state->params->get('save_history', 0) && $itemEditable)
 			{
 				JToolbarHelper::versions('com_contact.contact', $this->item->id);
 			}
diff --git a/administrator/components/com_content/views/article/view.html.php b/administrator/components/com_content/views/article/view.html.php
index accbcc4ae9243..6a28d3c98fe15 100644
--- a/administrator/components/com_content/views/article/view.html.php
+++ b/administrator/components/com_content/views/article/view.html.php
@@ -153,7 +153,7 @@ protected function addToolbar()
 				JToolbarHelper::save2copy('article.save2copy');
 			}
 
-			if ($this->state->params->get('save_history', 0) && $itemEditable)
+			if (JComponentHelper::isEnabled('com_contenthistory') && $this->state->params->get('save_history', 0) && $itemEditable)
 			{
 				JToolbarHelper::versions('com_content.article', $this->item->id);
 			}
diff --git a/administrator/components/com_newsfeeds/views/newsfeed/view.html.php b/administrator/components/com_newsfeeds/views/newsfeed/view.html.php
index 5b9c5322d1515..9e2a3983b2870 100644
--- a/administrator/components/com_newsfeeds/views/newsfeed/view.html.php
+++ b/administrator/components/com_newsfeeds/views/newsfeed/view.html.php
@@ -123,7 +123,7 @@ protected function addToolbar()
 		}
 		else
 		{
-			if ($this->state->params->get('save_history', 0) && $canDo->get('core.edit'))
+			if (JComponentHelper::isEnabled('com_contenthistory') && $this->state->params->get('save_history', 0) && $canDo->get('core.edit'))
 			{
 				JToolbarHelper::versions('com_newsfeeds.newsfeed', $this->item->id);
 			}
diff --git a/administrator/components/com_tags/views/tag/view.html.php b/administrator/components/com_tags/views/tag/view.html.php
index 2315fe51a2c2f..ca44f8fc5150e 100644
--- a/administrator/components/com_tags/views/tag/view.html.php
+++ b/administrator/components/com_tags/views/tag/view.html.php
@@ -117,7 +117,7 @@ protected function addToolbar()
 				JToolbarHelper::save2copy('tag.save2copy');
 			}
 
-			if ($this->state->params->get('save_history', 0) && $itemEditable)
+			if (JComponentHelper::isEnabled('com_contenthistory') && $this->state->params->get('save_history', 0) && $itemEditable)
 			{
 				JToolbarHelper::versions('com_tags.tag', $this->item->id);
 			}
diff --git a/administrator/components/com_users/views/note/view.html.php b/administrator/components/com_users/views/note/view.html.php
index 37476dcbe54e6..0c56868bca730 100644
--- a/administrator/components/com_users/views/note/view.html.php
+++ b/administrator/components/com_users/views/note/view.html.php
@@ -114,7 +114,7 @@ protected function addToolbar()
 		}
 		else
 		{
-			if ($this->state->params->get('save_history', 0) && $canDo->get('core.edit'))
+			if (JComponentHelper::isEnabled('com_contenthistory') && $this->state->params->get('save_history', 0) && $canDo->get('core.edit'))
 			{
 				JToolbarHelper::versions('com_users.note', $this->item->id);
 			}

From 3667d6bcff411c5701b57b6436e8d003f7f51b96 Mon Sep 17 00:00:00 2001
From: andrepereiradasilva <andrepereiradasilva@users.noreply.github.com>
Date: Tue, 6 Dec 2016 22:18:10 +0000
Subject: [PATCH 23/39] normallise (#12963)

---
 administrator/components/com_banners/config.xml | 9 +++++++--
 installation/sql/postgresql/joomla.sql          | 2 +-
 installation/sql/sqlazure/joomla.sql            | 2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/administrator/components/com_banners/config.xml b/administrator/components/com_banners/config.xml
index c81c7627c437d..74e81cb77c9ee 100644
--- a/administrator/components/com_banners/config.xml
+++ b/administrator/components/com_banners/config.xml
@@ -12,7 +12,7 @@
 			label="COM_BANNERS_FIELD_PURCHASETYPE_LABEL"
 			description="COM_BANNERS_FIELD_PURCHASETYPE_DESC"
 			id="purchase_type"
-			default="0"
+			default="1"
 			>
 			<option value="1">COM_BANNERS_FIELD_VALUE_UNLIMITED</option>
 			<option value="2">COM_BANNERS_FIELD_VALUE_YEARLY</option>
@@ -50,8 +50,11 @@
 			type="text"
 			label="COM_BANNERS_FIELD_METAKEYWORDPREFIX_LABEL"
 			description="COM_BANNERS_FIELD_METAKEYWORDPREFIX_DESC"
+			default=""
 		/>
+
 	</fieldset>
+
 	<fieldset
 		name="banners"
 		label="COM_BANNERS_FIELDSET_CONFIG_BANNER_OPTIONS_LABEL"
@@ -76,9 +79,10 @@
 			label="JGLOBAL_HISTORY_LIMIT_OPTIONS_LABEL"
 			description="JGLOBAL_HISTORY_LIMIT_OPTIONS_DESC"
 			filter="integer"
-			default="5"
+			default="10"
 			showon="save_history:1"
 		/>
+
 	</fieldset>
 
 	<fieldset
@@ -96,5 +100,6 @@
 			component="com_banners"
 			section="component"
 		/>
+
 	</fieldset>
 </config>
diff --git a/installation/sql/postgresql/joomla.sql b/installation/sql/postgresql/joomla.sql
index 317fe826af09e..204616145661b 100644
--- a/installation/sql/postgresql/joomla.sql
+++ b/installation/sql/postgresql/joomla.sql
@@ -474,7 +474,7 @@ INSERT INTO "#__extensions" ("extension_id", "name", "type", "element", "folder"
 (1, 'com_mailto', 'component', 'com_mailto', '', 0, 1, 1, 1, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0),
 (2, 'com_wrapper', 'component', 'com_wrapper', '', 0, 1, 1, 1, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0),
 (3, 'com_admin', 'component', 'com_admin', '', 1, 1, 1, 1, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0),
-(4, 'com_banners', 'component', 'com_banners', '', 1, 1, 1, 0, '', '{"purchase_type":"3","track_impressions":"0","track_clicks":"0","metakey_prefix":"","save_history":"1","history_limit":5}', '', '', 0, '1970-01-01 00:00:00', 0, 0),
+(4, 'com_banners', 'component', 'com_banners', '', 1, 1, 1, 0, '', '{"purchase_type":"3","track_impressions":"0","track_clicks":"0","metakey_prefix":"","save_history":"1","history_limit":10}', '', '', 0, '1970-01-01 00:00:00', 0, 0),
 (5, 'com_cache', 'component', 'com_cache', '', 1, 1, 1, 1, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0),
 (6, 'com_categories', 'component', 'com_categories', '', 1, 1, 1, 1, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0),
 (7, 'com_checkin', 'component', 'com_checkin', '', 1, 1, 1, 1, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0),
diff --git a/installation/sql/sqlazure/joomla.sql b/installation/sql/sqlazure/joomla.sql
index b1665a2b12bd1..b5d640657c62d 100644
--- a/installation/sql/sqlazure/joomla.sql
+++ b/installation/sql/sqlazure/joomla.sql
@@ -750,7 +750,7 @@ SELECT 2, 'com_wrapper', 'component', 'com_wrapper', '', 0, 1, 1, 1, '', '', '',
 UNION ALL
 SELECT 3, 'com_admin', 'component', 'com_admin', '', 1, 1, 1, 1, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0
 UNION ALL
-SELECT 4, 'com_banners', 'component', 'com_banners', '', 1, 1, 1, 0, '', '{"purchase_type":"3","track_impressions":"0","track_clicks":"0","metakey_prefix":"","save_history":"1","history_limit":5}', '', '', 0, '1900-01-01 00:00:00', 0, 0
+SELECT 4, 'com_banners', 'component', 'com_banners', '', 1, 1, 1, 0, '', '{"purchase_type":"3","track_impressions":"0","track_clicks":"0","metakey_prefix":"","save_history":"1","history_limit":10}', '', '', 0, '1900-01-01 00:00:00', 0, 0
 UNION ALL
 SELECT 5, 'com_cache', 'component', 'com_cache', '', 1, 1, 1, 1, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0
 UNION ALL

From 467708343ff28cb3188acc2003f8221d55a69756 Mon Sep 17 00:00:00 2001
From: Allon Moritz <allon.moritz@digital-peak.com>
Date: Tue, 6 Dec 2016 23:18:33 +0100
Subject: [PATCH 24/39] Support clearing the custom fields data (#12967)

---
 plugins/system/fields/fields.php | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/plugins/system/fields/fields.php b/plugins/system/fields/fields.php
index e6e5d183f2a0f..700d965462dda 100644
--- a/plugins/system/fields/fields.php
+++ b/plugins/system/fields/fields.php
@@ -76,24 +76,13 @@ public function onContentBeforeSave($context, $item, $isNew)
 
 		$params = $params->toArray();
 
-		if (!$params)
-		{
-			return true;
-		}
-
 		// Create the new internal fields field
 		$fields = array();
 
 		foreach ($fieldsObjects as $field)
 		{
-			// Only save the fields with the alias from the data
-			if (!key_exists($field->alias, $params))
-			{
-				continue;
-			}
-
 			// Set the param on the fields variable
-			$fields[$field->alias] = $params[$field->alias];
+			$fields[$field->alias] = key_exists($field->alias, $params) ? $params[$field->alias] : array();
 
 			// Remove it from the params array
 			unset($params[$field->alias]);

From 972808dc729973ff7cf82b90421cb1e2a85bca23 Mon Sep 17 00:00:00 2001
From: andrepereiradasilva <andrepereiradasilva@users.noreply.github.com>
Date: Tue, 6 Dec 2016 22:19:05 +0000
Subject: [PATCH 25/39] [com_search] review config global default options
 (#12975)

* Update config.xml

* Update joomla.sql

* Update joomla.sql

* Update joomla.sql
---
 .../components/com_search/config.xml          | 55 +++++++++++--------
 installation/sql/mysql/joomla.sql             |  2 +-
 installation/sql/postgresql/joomla.sql        |  2 +-
 installation/sql/sqlazure/joomla.sql          |  2 +-
 4 files changed, 36 insertions(+), 25 deletions(-)

diff --git a/administrator/components/com_search/config.xml b/administrator/components/com_search/config.xml
index 69b5cf4f94602..056f405d94214 100644
--- a/administrator/components/com_search/config.xml
+++ b/administrator/components/com_search/config.xml
@@ -1,46 +1,51 @@
 <?xml version="1.0" encoding="utf-8"?>
 <config>
 	<fieldset name="component">
+
 		<field
 			name="enabled"
 			type="radio"
+			label="COM_SEARCH_CONFIG_GATHER_SEARCH_STATISTICS_LABEL"
+			description="COM_SEARCH_CONFIG_GATHER_SEARCH_STATISTICS_DESC"
 			class="btn-group btn-group-yesno"
 			default="0"
-			label="COM_SEARCH_CONFIG_GATHER_SEARCH_STATISTICS_LABEL"
-			description="COM_SEARCH_CONFIG_GATHER_SEARCH_STATISTICS_DESC">
+			>
 			<option value="1">JYES</option>
 			<option value="0">JNO</option>
 		</field>
 
-		<field name="search_phrases"
-				type="radio"
-				class="btn-group btn-group-yesno"
-				default="1"
-				description="COM_SEARCH_FIELD_SEARCH_PHRASES_DESC"
-				label="COM_SEARCH_FIELD_SEARCH_PHRASES_LABEL"
+		<field
+			name="search_phrases"
+			type="radio"
+			label="COM_SEARCH_FIELD_SEARCH_PHRASES_LABEL"
+			description="COM_SEARCH_FIELD_SEARCH_PHRASES_DESC"
+			class="btn-group btn-group-yesno"
+			default="1"
 			>
-				<option value="1">JYES</option>
-				<option value="0">JNO</option>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
 		</field>
 
-		<field name="search_areas"
-				type="radio"
-				class="btn-group btn-group-yesno"
-				default="1"
-				description="COM_SEARCH_FIELD_SEARCH_AREAS_DESC"
-				label="COM_SEARCH_FIELD_SEARCH_AREAS_LABEL"
+		<field
+			name="search_areas"
+			type="radio"
+			label="COM_SEARCH_FIELD_SEARCH_AREAS_LABEL"
+			description="COM_SEARCH_FIELD_SEARCH_AREAS_DESC"
+			class="btn-group btn-group-yesno"
+			default="1"
 			>
-				<option value="1">JYES</option>
-				<option value="0">JNO</option>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
 		</field>
 
 		<field
 			name="show_date"
 			type="radio"
+			label="COM_SEARCH_CONFIG_FIELD_CREATED_DATE_LABEL"
+			description="COM_SEARCH_CONFIG_FIELD_CREATED_DATE_DESC"
 			class="btn-group btn-group-yesno"
 			default="1"
-			label="COM_SEARCH_CONFIG_FIELD_CREATED_DATE_LABEL"
-			description="COM_SEARCH_CONFIG_FIELD_CREATED_DATE_DESC">
+			>
 			<option value="1">JSHOW</option>
 			<option value="0">JHIDE</option>
 		</field>
@@ -50,6 +55,7 @@
 			type="text"
 			label="COM_SEARCH_CONFIG_FIELD_OPENSEARCH_NAME_LABEL"
 			description="COM_SEARCH_CONFIG_FIELD_OPENSEARCH_NAME_DESC"
+			default=""
 		/>
 
 		<field
@@ -57,8 +63,11 @@
 			type="textarea"
 			label="COM_SEARCH_CONFIG_FIELD_OPENSEARCH_DESCRIPTON_LABEL"
 			description="COM_SEARCH_CONFIG_FIELD_OPENSEARCH_DESCRIPTON_DESC"
-			cols="30" rows="2"
+			default=""
+			cols="30"
+			rows="2"
 		/>
+
 	</fieldset>
 
 	<fieldset
@@ -74,6 +83,8 @@
 			filter="rules"
 			validate="rules"
 			component="com_search"
-			section="component" />
+			section="component"
+		/>
+
 	</fieldset>
 </config>
diff --git a/installation/sql/mysql/joomla.sql b/installation/sql/mysql/joomla.sql
index a3339f126c52b..83e0b87bf215d 100644
--- a/installation/sql/mysql/joomla.sql
+++ b/installation/sql/mysql/joomla.sql
@@ -502,7 +502,7 @@ INSERT INTO `#__extensions` (`extension_id`, `name`, `type`, `element`, `folder`
 (16, 'com_modules', 'component', 'com_modules', '', 1, 1, 1, 1, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0),
 (17, 'com_newsfeeds', 'component', 'com_newsfeeds', '', 1, 1, 1, 0, '', '{"newsfeed_layout":"_:default","save_history":"1","history_limit":5,"show_feed_image":"1","show_feed_description":"1","show_item_description":"1","feed_character_count":"0","feed_display_order":"des","float_first":"right","float_second":"right","show_tags":"1","category_layout":"_:default","show_category_title":"1","show_description":"1","show_description_image":"1","maxLevel":"-1","show_empty_categories":"0","show_subcat_desc":"1","show_cat_items":"1","show_cat_tags":"1","show_base_description":"1","maxLevelcat":"-1","show_empty_categories_cat":"0","show_subcat_desc_cat":"1","show_cat_items_cat":"1","filter_field":"1","show_pagination_limit":"1","show_headings":"1","show_articles":"0","show_link":"1","show_pagination":"1","show_pagination_results":"1"}', '', '', 0, '0000-00-00 00:00:00', 0, 0),
 (18, 'com_plugins', 'component', 'com_plugins', '', 1, 1, 1, 1, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0),
-(19, 'com_search', 'component', 'com_search', '', 1, 1, 1, 0, '', '{"enabled":"0","show_date":"1"}', '', '', 0, '0000-00-00 00:00:00', 0, 0),
+(19, 'com_search', 'component', 'com_search', '', 1, 1, 1, 0, '', '{"enabled":"0","search_phrases":"1","search_areas":"1","show_date":"1","opensearch_name":"","opensearch_description":""}', '', '', 0, '0000-00-00 00:00:00', 0, 0),
 (20, 'com_templates', 'component', 'com_templates', '', 1, 1, 1, 1, '', '{"template_positions_display":"0","upload_limit":"10","image_formats":"gif,bmp,jpg,jpeg,png","source_formats":"txt,less,ini,xml,js,php,css,scss,sass","font_formats":"woff,ttf,otf","compressed_formats":"zip"}', '', '', 0, '0000-00-00 00:00:00', 0, 0),
 (22, 'com_content', 'component', 'com_content', '', 1, 1, 0, 1, '', '{"article_layout":"_:default","show_title":"1","link_titles":"1","show_intro":"1","show_category":"1","link_category":"1","show_parent_category":"0","link_parent_category":"0","show_author":"1","link_author":"0","show_create_date":"0","show_modify_date":"0","show_publish_date":"1","show_item_navigation":"1","show_vote":"0","show_readmore":"1","show_readmore_title":"1","readmore_limit":"100","show_icons":"1","show_print_icon":"1","show_email_icon":"1","show_hits":"1","show_noauth":"0","show_publishing_options":"1","show_article_options":"1","save_history":"1","history_limit":10,"show_urls_images_frontend":"0","show_urls_images_backend":"1","targeta":0,"targetb":0,"targetc":0,"float_intro":"left","float_fulltext":"left","category_layout":"_:blog","show_category_title":"0","show_description":"0","show_description_image":"0","maxLevel":"1","show_empty_categories":"0","show_no_articles":"1","show_subcat_desc":"1","show_cat_num_articles":"0","show_base_description":"1","maxLevelcat":"-1","show_empty_categories_cat":"0","show_subcat_desc_cat":"1","show_cat_num_articles_cat":"1","num_leading_articles":"1","num_intro_articles":"4","num_columns":"2","num_links":"4","multi_column_order":"0","show_subcategory_content":"0","show_pagination_limit":"1","filter_field":"hide","show_headings":"1","list_show_date":"0","date_format":"","list_show_hits":"1","list_show_author":"1","orderby_pri":"order","orderby_sec":"rdate","order_date":"published","show_pagination":"2","show_pagination_results":"1","show_feed_link":"1","feed_summary":"0"}', '', '', 0, '0000-00-00 00:00:00', 0, 0),
 (23, 'com_config', 'component', 'com_config', '', 1, 1, 0, 1, '', '{"filters":{"1":{"filter_type":"NH","filter_tags":"","filter_attributes":""},"6":{"filter_type":"BL","filter_tags":"","filter_attributes":""},"7":{"filter_type":"NONE","filter_tags":"","filter_attributes":""},"2":{"filter_type":"NH","filter_tags":"","filter_attributes":""},"3":{"filter_type":"BL","filter_tags":"","filter_attributes":""},"4":{"filter_type":"BL","filter_tags":"","filter_attributes":""},"5":{"filter_type":"BL","filter_tags":"","filter_attributes":""},"10":{"filter_type":"BL","filter_tags":"","filter_attributes":""},"12":{"filter_type":"BL","filter_tags":"","filter_attributes":""},"8":{"filter_type":"NONE","filter_tags":"","filter_attributes":""}}}', '', '', 0, '0000-00-00 00:00:00', 0, 0),
diff --git a/installation/sql/postgresql/joomla.sql b/installation/sql/postgresql/joomla.sql
index 204616145661b..6ca4030e01850 100644
--- a/installation/sql/postgresql/joomla.sql
+++ b/installation/sql/postgresql/joomla.sql
@@ -489,7 +489,7 @@ INSERT INTO "#__extensions" ("extension_id", "name", "type", "element", "folder"
 (16, 'com_modules', 'component', 'com_modules', '', 1, 1, 1, 1, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0),
 (17, 'com_newsfeeds', 'component', 'com_newsfeeds', '', 1, 1, 1, 0, '', '{"newsfeed_layout":"_:default","save_history":"1","history_limit":5,"show_feed_image":"1","show_feed_description":"1","show_item_description":"1","feed_character_count":"0","feed_display_order":"des","float_first":"right","float_second":"right","show_tags":"1","category_layout":"_:default","show_category_title":"1","show_description":"1","show_description_image":"1","maxLevel":"-1","show_empty_categories":"0","show_subcat_desc":"1","show_cat_items":"1","show_cat_tags":"1","show_base_description":"1","maxLevelcat":"-1","show_empty_categories_cat":"0","show_subcat_desc_cat":"1","show_cat_items_cat":"1","filter_field":"1","show_pagination_limit":"1","show_headings":"1","show_articles":"0","show_link":"1","show_pagination":"1","show_pagination_results":"1"}', '', '', 0, '1970-01-01 00:00:00', 0, 0),
 (18, 'com_plugins', 'component', 'com_plugins', '', 1, 1, 1, 1, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0),
-(19, 'com_search', 'component', 'com_search', '', 1, 1, 1, 0, '', '{"enabled":"0","show_date":"1"}', '', '', 0, '1970-01-01 00:00:00', 0, 0),
+(19, 'com_search', 'component', 'com_search', '', 1, 1, 1, 0, '', '{"enabled":"0","search_phrases":"1","search_areas":"1","show_date":"1","opensearch_name":"","opensearch_description":""}', '', '', 0, '1970-01-01 00:00:00', 0, 0),
 (20, 'com_templates', 'component', 'com_templates', '', 1, 1, 1, 1, '', '{"template_positions_display":"0","upload_limit":"10","image_formats":"gif,bmp,jpg,jpeg,png","source_formats":"txt,less,ini,xml,js,php,css,scss,sass","font_formats":"woff,ttf,otf","compressed_formats":"zip"}', '', '', 0, '1970-01-01 00:00:00', 0, 0),
 (22, 'com_content', 'component', 'com_content', '', 1, 1, 0, 1, '', '{"article_layout":"_:default","show_title":"1","link_titles":"1","show_intro":"1","show_category":"1","link_category":"1","show_parent_category":"0","link_parent_category":"0","show_author":"1","link_author":"0","show_create_date":"0","show_modify_date":"0","show_publish_date":"1","show_item_navigation":"1","show_vote":"0","show_readmore":"1","show_readmore_title":"1","readmore_limit":"100","show_icons":"1","show_print_icon":"1","show_email_icon":"1","show_hits":"1","show_noauth":"0","show_publishing_options":"1","show_article_options":"1","save_history":"1","history_limit":10,"show_urls_images_frontend":"0","show_urls_images_backend":"1","targeta":0,"targetb":0,"targetc":0,"float_intro":"left","float_fulltext":"left","category_layout":"_:blog","show_category_title":"0","show_description":"0","show_description_image":"0","maxLevel":"1","show_empty_categories":"0","show_no_articles":"1","show_subcat_desc":"1","show_cat_num_articles":"0","show_base_description":"1","maxLevelcat":"-1","show_empty_categories_cat":"0","show_subcat_desc_cat":"1","show_cat_num_articles_cat":"1","num_leading_articles":"1","num_intro_articles":"4","num_columns":"2","num_links":"4","multi_column_order":"0","show_subcategory_content":"0","show_pagination_limit":"1","filter_field":"hide","show_headings":"1","list_show_date":"0","date_format":"","list_show_hits":"1","list_show_author":"1","orderby_pri":"order","orderby_sec":"rdate","order_date":"published","show_pagination":"2","show_pagination_results":"1","show_feed_link":"1","feed_summary":"0"}', '', '', 0, '1970-01-01 00:00:00', 0, 0),
 (23, 'com_config', 'component', 'com_config', '', 1, 1, 0, 1, '', '{"filters":{"1":{"filter_type":"NH","filter_tags":"","filter_attributes":""},"6":{"filter_type":"BL","filter_tags":"","filter_attributes":""},"7":{"filter_type":"NONE","filter_tags":"","filter_attributes":""},"2":{"filter_type":"NH","filter_tags":"","filter_attributes":""},"3":{"filter_type":"BL","filter_tags":"","filter_attributes":""},"4":{"filter_type":"BL","filter_tags":"","filter_attributes":""},"5":{"filter_type":"BL","filter_tags":"","filter_attributes":""},"10":{"filter_type":"BL","filter_tags":"","filter_attributes":""},"12":{"filter_type":"BL","filter_tags":"","filter_attributes":""},"8":{"filter_type":"NONE","filter_tags":"","filter_attributes":""}}}', '', '', 0, '1970-01-01 00:00:00', 0, 0),
diff --git a/installation/sql/sqlazure/joomla.sql b/installation/sql/sqlazure/joomla.sql
index b5d640657c62d..cede4d340b674 100644
--- a/installation/sql/sqlazure/joomla.sql
+++ b/installation/sql/sqlazure/joomla.sql
@@ -780,7 +780,7 @@ SELECT 17, 'com_newsfeeds', 'component', 'com_newsfeeds', '', 1, 1, 1, 0, '', '{
 UNION ALL
 SELECT 18, 'com_plugins', 'component', 'com_plugins', '', 1, 1, 1, 1, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0
 UNION ALL
-SELECT 19, 'com_search', 'component', 'com_search', '', 1, 1, 1, 0, '', '{"enabled":"0","show_date":"1"}', '', '', 0, '1900-01-01 00:00:00', 0, 0
+SELECT 19, 'com_search', 'component', 'com_search', '', 1, 1, 1, 0, '', '{"enabled":"0","search_phrases":"1","search_areas":"1","show_date":"1","opensearch_name":"","opensearch_description":""}', '', '', 0, '1900-01-01 00:00:00', 0, 0
 UNION ALL
 SELECT 20, 'com_templates', 'component', 'com_templates', '', 1, 1, 1, 1, '', '{"template_positions_display":"0","upload_limit":"10","image_formats":"gif,bmp,jpg,jpeg,png","source_formats":"txt,less,ini,xml,js,php,css,scss,sass","font_formats":"woff,ttf,otf","compressed_formats":"zip"}', '', '', 0, '1900-01-01 00:00:00', 0, 0
 UNION ALL

From 547fe9faaffb687195063763a3f241af44f9f499 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Gejdeb=C3=A4ck?= <martin.hultman@sweco.se>
Date: Tue, 6 Dec 2016 23:25:02 +0100
Subject: [PATCH 26/39] Fixing sql server query foreach error on no database
 join (#13003)

---
 libraries/joomla/database/query/sqlsrv.php | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/libraries/joomla/database/query/sqlsrv.php b/libraries/joomla/database/query/sqlsrv.php
index d0de5b85f431b..1f9f1022287df 100644
--- a/libraries/joomla/database/query/sqlsrv.php
+++ b/libraries/joomla/database/query/sqlsrv.php
@@ -391,17 +391,20 @@ public function group($columns)
 
 		// Now we need to get all tables from any joins
 		// Go through all joins and add them to the tables array
-		foreach ($this->join as $join)
+		if ($this->join)
 		{
-			$joinTbl = str_replace("#__", $this->db->getPrefix(), str_replace("]", "", preg_replace("/.*(#.+\sAS\s[^\s]*).*/i", "$1", (string) $join)));
+			foreach ($this->join as $join)
+			{
+				$joinTbl = str_replace("#__", $this->db->getPrefix(), str_replace("]", "", preg_replace("/.*(#.+\sAS\s[^\s]*).*/i", "$1", (string) $join)));
 
-			list($table, $alias) = preg_split("/\sAS\s/i", $joinTbl);
+				list($table, $alias) = preg_split("/\sAS\s/i", $joinTbl);
 
-			$tmpCols = $this->db->getTableColumns(trim($table));
+				$tmpCols = $this->db->getTableColumns(trim($table));
 
-			foreach ($tmpCols as $name => $tmpColType)
-			{
-				array_push($cols, $alias . "." . $name);
+				foreach ($tmpCols as $name => $tmpColType)
+				{
+					array_push($cols, $alias . "." . $name);
+				}
 			}
 		}
 

From bb3ee1a7cfec6e05a6ff117c96f0d413b1e214a1 Mon Sep 17 00:00:00 2001
From: zero-24 <zero-24@users.noreply.github.com>
Date: Tue, 6 Dec 2016 23:25:15 +0100
Subject: [PATCH 27/39] just two missing clean lines in the code (#13015)

---
 administrator/components/com_joomlaupdate/models/default.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/administrator/components/com_joomlaupdate/models/default.php b/administrator/components/com_joomlaupdate/models/default.php
index b3a2be07f9245..c300412c21e3c 100644
--- a/administrator/components/com_joomlaupdate/models/default.php
+++ b/administrator/components/com_joomlaupdate/models/default.php
@@ -259,8 +259,10 @@ public function download()
 			$packageURL = $headers['Location'];
 			$headers    = get_headers($packageURL, 1);
 		}
+
 		// Remove protocol, path and query string from URL
 		$basename = basename($packageURL);
+
 		if (strpos($basename, '?') !== false)
 		{
 			$basename = substr($basename, 0, strpos($basename, '?'));

From 1111207f7dc19a2f8515120c54873925ec41e195 Mon Sep 17 00:00:00 2001
From: marcochirienti <marco.chirienti@gmail.com>
Date: Tue, 6 Dec 2016 23:26:13 +0100
Subject: [PATCH 28/39] Coding standards - References and control structures
 (#13022)

* Coding standards. The PHP constants true, false, and null MUST be in lower case.

* Update restore.php

* Coding standards - Reference.
When using references, there should be a space before the reference operator and no space between it and the function or variable name.
Found 7 hits in 5 files.

See https://github.com/joomla/coding-standards/blob/master/manual/php.md#references

* Coding standards - Control Structures
For all control structures there is a space between the keyword and an opening parenthesis.

See
https://github.com/joomla/coding-standards/blob/master/manual/php.md#control-structures-general-code
---
 .../views/warnings/tmpl/default.php           |  2 +-
 .../com_modules/views/module/tmpl/edit.php    |  6 ++---
 .../com_plugins/views/plugin/tmpl/edit.php    |  6 ++---
 .../com_tags/views/tag/tmpl/edit_metadata.php |  2 +-
 .../views/template/tmpl/default.php           | 24 ++++++++---------
 .../views/template/tmpl/default_folders.php   |  4 +--
 .../views/template/tmpl/default_tree.php      |  6 ++---
 .../com_users/views/user/tmpl/edit.php        |  2 +-
 .../html/com_postinstall/messages/default.php |  2 +-
 .../html/com_templates/template/default.php   | 26 +++++++++----------
 .../template/default_folders.php              |  4 +--
 .../hathor/html/com_users/user/edit.php       |  2 +-
 .../views/categories/tmpl/default_items.php   |  2 +-
 .../views/categories/tmpl/default_items.php   |  2 +-
 .../com_finder/views/search/view.html.php     |  2 +-
 .../views/categories/tmpl/default_items.php   |  2 +-
 components/com_tags/views/tags/view.html.php  |  2 +-
 .../com_users/views/profile/tmpl/edit.php     |  2 +-
 installation/view/summary/tmpl/default.php    |  2 +-
 layouts/joomla/edit/frontediting_modules.php  |  2 +-
 layouts/joomla/form/field/subform/default.php |  2 +-
 .../form/field/subform/repeatable-table.php   |  6 ++---
 .../repeatable-table/section-byfieldsets.php  |  4 +--
 .../subform/repeatable-table/section.php      |  2 +-
 .../joomla/form/field/subform/repeatable.php  |  2 +-
 .../repeatable/section-byfieldsets.php        |  4 +--
 .../form/field/subform/repeatable/section.php |  2 +-
 .../html/com_content/category/blog_item.php   |  2 +-
 .../html/com_content/category/blog_links.php  |  2 +-
 templates/protostar/error.php                 |  2 +-
 templates/protostar/index.php                 |  2 +-
 tests/unit/core/helper/helper.php             |  6 ++---
 .../cms/pagination/JPaginationTest.php        |  2 +-
 .../joomla/archive/JArchiveTestCase.php       |  2 +-
 34 files changed, 71 insertions(+), 71 deletions(-)

diff --git a/administrator/components/com_installer/views/warnings/tmpl/default.php b/administrator/components/com_installer/views/warnings/tmpl/default.php
index debd56f6465ce..3997fbcec984e 100644
--- a/administrator/components/com_installer/views/warnings/tmpl/default.php
+++ b/administrator/components/com_installer/views/warnings/tmpl/default.php
@@ -22,7 +22,7 @@
 		<?php if (count($this->messages)) : ?>
 			<?php echo JHtml::_('bootstrap.startAccordion', 'warnings', array('active' => 'warning0')); ?>
 				<?php $i = 0; ?>
-				<?php foreach($this->messages as $message) : ?>
+				<?php foreach ($this->messages as $message) : ?>
 					<?php echo JHtml::_('bootstrap.addSlide', 'warnings', $message['message'], 'warning' . ($i++)); ?>
 						<?php echo $message['description']; ?>
 					<?php echo JHtml::_('bootstrap.endSlide'); ?>
diff --git a/administrator/components/com_modules/views/module/tmpl/edit.php b/administrator/components/com_modules/views/module/tmpl/edit.php
index a29aa1293b3e6..2e2c2301c7cd6 100644
--- a/administrator/components/com_modules/views/module/tmpl/edit.php
+++ b/administrator/components/com_modules/views/module/tmpl/edit.php
@@ -194,12 +194,12 @@
 							$short_description = JText::_($this->item->xml->description);
 							$this->fieldset = 'description';
 							$long_description = JLayoutHelper::render('joomla.edit.fieldset', $this);
-							if(!$long_description) {
+							if (!$long_description) {
 								$truncated = JHtmlString::truncate($short_description, 550, true, false);
-								if(strlen($truncated) > 500) {
+								if (strlen($truncated) > 500) {
 									$long_description = $short_description;
 									$short_description = JHtmlString::truncate($truncated, 250);
-									if($short_description == $long_description) {
+									if ($short_description == $long_description) {
 										$long_description = '';
 									}
 								}
diff --git a/administrator/components/com_plugins/views/plugin/tmpl/edit.php b/administrator/components/com_plugins/views/plugin/tmpl/edit.php
index c024d28dc3aa1..35343a31c8930 100644
--- a/administrator/components/com_plugins/views/plugin/tmpl/edit.php
+++ b/administrator/components/com_plugins/views/plugin/tmpl/edit.php
@@ -63,12 +63,12 @@
 							$short_description = JText::_($this->item->xml->description);
 							$this->fieldset = 'description';
 							$long_description = JLayoutHelper::render('joomla.edit.fieldset', $this);
-							if(!$long_description) {
+							if (!$long_description) {
 								$truncated = JHtmlString::truncate($short_description, 550, true, false);
-								if(strlen($truncated) > 500) {
+								if (strlen($truncated) > 500) {
 									$long_description = $short_description;
 									$short_description = JHtmlString::truncate($truncated, 250);
-									if($short_description == $long_description) {
+									if ($short_description == $long_description) {
 										$long_description = '';
 									}
 								}
diff --git a/administrator/components/com_tags/views/tag/tmpl/edit_metadata.php b/administrator/components/com_tags/views/tag/tmpl/edit_metadata.php
index 33ddf62260c72..bac041f112e56 100644
--- a/administrator/components/com_tags/views/tag/tmpl/edit_metadata.php
+++ b/administrator/components/com_tags/views/tag/tmpl/edit_metadata.php
@@ -21,7 +21,7 @@
 		<?php echo $this->form->getInput('metakey'); ?>
 	</div>
 </div>
-<?php foreach($this->form->getGroup('metadata') as $field): ?>
+<?php foreach ($this->form->getGroup('metadata') as $field): ?>
 <div class="control-group">
 	<?php if (!$field->hidden): ?>
 		<?php echo $field->label; ?>
diff --git a/administrator/components/com_templates/views/template/tmpl/default.php b/administrator/components/com_templates/views/template/tmpl/default.php
index a164b3b6ebd1f..3e1438f22c02f 100644
--- a/administrator/components/com_templates/views/template/tmpl/default.php
+++ b/administrator/components/com_templates/views/template/tmpl/default.php
@@ -77,7 +77,7 @@
 	});
 });");
 
-if($this->type == 'image')
+if ($this->type == 'image')
 {
 	JFactory::getDocument()->addScriptDeclaration("
 		jQuery(document).ready(function($) {
@@ -150,7 +150,7 @@ function clearCoords()
 	}
 ");
 
-if($this->type == 'font')
+if ($this->type == 'font')
 {
 	JFactory::getDocument()->addStyleDeclaration(
 			"/* Styles for font preview */
@@ -170,13 +170,13 @@ function clearCoords()
 <?php echo JHtml::_('bootstrap.addTab', 'myTab', 'editor', JText::_('COM_TEMPLATES_TAB_EDITOR')); ?>
 <div class="row-fluid">
 	<div class="span12">
-		<?php if($this->type == 'file'): ?>
+		<?php if ($this->type == 'file'): ?>
 			<p class="well well-small lead"><?php echo JText::sprintf('COM_TEMPLATES_TEMPLATE_FILENAME', $this->source->filename, $this->template->element); ?></p>
 		<?php endif; ?>
-		<?php if($this->type == 'image'): ?>
+		<?php if ($this->type == 'image'): ?>
 			<p class="well well-small lead"><?php echo JText::sprintf('COM_TEMPLATES_TEMPLATE_FILENAME', $this->image['path'], $this->template->element); ?></p>
 		<?php endif; ?>
-		<?php if($this->type == 'font'): ?>
+		<?php if ($this->type == 'font'): ?>
 			<p class="well well-small lead"><?php echo JText::sprintf('COM_TEMPLATES_TEMPLATE_FILENAME', $this->font['rel_path'], $this->template->element); ?></p>
 		<?php endif; ?>
 	</div>
@@ -186,7 +186,7 @@ function clearCoords()
 		<?php echo $this->loadTemplate('tree');?>
 	</div>
 	<div class="span9">
-		<?php if($this->type == 'home'): ?>
+		<?php if ($this->type == 'home'): ?>
 			<form action="<?php echo JRoute::_('index.php?option=com_templates&view=template&id=' . $input->getInt('id') . '&file=' . $this->file); ?>" method="post" name="adminForm" id="adminForm" class="form-horizontal">
 				<input type="hidden" name="task" value="" />
 				<?php echo JHtml::_('form.token'); ?>
@@ -201,7 +201,7 @@ function clearCoords()
 				</div>
 			</form>
 		<?php endif; ?>
-		<?php if($this->type == 'file'): ?>
+		<?php if ($this->type == 'file'): ?>
 			<form action="<?php echo JRoute::_('index.php?option=com_templates&view=template&id=' . $input->getInt('id') . '&file=' . $this->file); ?>" method="post" name="adminForm" id="adminForm" class="form-horizontal">
 
 				<div class="editor-border">
@@ -214,7 +214,7 @@ function clearCoords()
 
 			</form>
 		<?php endif; ?>
-		<?php if($this->type == 'archive'): ?>
+		<?php if ($this->type == 'archive'): ?>
 			<legend><?php echo JText::_('COM_TEMPLATES_FILE_CONTENT_PREVIEW'); ?></legend>
 			<form action="<?php echo JRoute::_('index.php?option=com_templates&view=template&id=' . $input->getInt('id') . '&file=' . $this->file); ?>" method="post" name="adminForm" id="adminForm" class="form-horizontal">
 				<ul class="nav nav-stacked nav-list well">
@@ -234,7 +234,7 @@ function clearCoords()
 
 			</form>
 		<?php endif; ?>
-		<?php if($this->type == 'image'): ?>
+		<?php if ($this->type == 'image'): ?>
 			<img id="image-crop" src="<?php echo $this->image['address'] . '?' . time(); ?>" />
 			<form action="<?php echo JRoute::_('index.php?option=com_templates&view=template&id=' . $input->getInt('id') . '&file=' . $this->file); ?>" method="post" name="adminForm" id="adminForm" class="form-horizontal">
 				<fieldset class="adminform">
@@ -247,7 +247,7 @@ function clearCoords()
 				</fieldset>
 			</form>
 		<?php endif; ?>
-		<?php if($this->type == 'font'): ?>
+		<?php if ($this->type == 'font'): ?>
 			<div class="font-preview">
 				<form action="<?php echo JRoute::_('index.php?option=com_templates&view=template&id=' . $input->getInt('id') . '&file=' . $this->file); ?>" method="post" name="adminForm" id="adminForm" class="form-horizontal">
 					<fieldset class="adminform">
@@ -311,7 +311,7 @@ function clearCoords()
 		<legend><?php echo JText::_('COM_TEMPLATES_OVERRIDES_MODULES');?></legend>
 		<ul class="nav nav-list">
 			<?php $token = JSession::getFormToken() . '=' . 1; ?>
-			<?php foreach($this->overridesList['modules'] as $module): ?>
+			<?php foreach ($this->overridesList['modules'] as $module): ?>
 				<li>
 					<?php
 					$overrideLinkUrl = 'index.php?option=com_templates&view=template&task=template.overrides&folder=' . $module->path
@@ -354,7 +354,7 @@ function clearCoords()
 		<legend><?php echo JText::_('COM_TEMPLATES_OVERRIDES_LAYOUTS');?></legend>
 		<ul class="nav nav-list">
 			<?php $token = JSession::getFormToken() . '=' . 1; ?>
-			<?php foreach($this->overridesList['layouts'] as $layout): ?>
+			<?php foreach ($this->overridesList['layouts'] as $layout): ?>
 				<li>
 					<?php
 					$overrideLinkUrl = 'index.php?option=com_templates&view=template&task=template.overrides&folder=' . $layout->path
diff --git a/administrator/components/com_templates/views/template/tmpl/default_folders.php b/administrator/components/com_templates/views/template/tmpl/default_folders.php
index 6af67ce4e350d..28ffe1a75fb1d 100644
--- a/administrator/components/com_templates/views/template/tmpl/default_folders.php
+++ b/administrator/components/com_templates/views/template/tmpl/default_folders.php
@@ -12,8 +12,8 @@
 ?>
 
 <ul class='nav nav-list directory-tree'>
-	<?php foreach($this->files as $key => $value): ?>
-		<?php if(is_array($value)): ?>
+	<?php foreach ($this->files as $key => $value): ?>
+		<?php if (is_array($value)): ?>
 			<li class="folder-select">
 				<a class='folder-url nowrap' data-id='<?php echo base64_encode($key); ?>' href=''>
 					<span class='icon-folder-close'>&nbsp;<?php $explodeArray = explode('/', $key); echo end($explodeArray); ?></span>
diff --git a/administrator/components/com_templates/views/template/tmpl/default_tree.php b/administrator/components/com_templates/views/template/tmpl/default_tree.php
index 62f48c0d1a848..7cb55f94160b3 100644
--- a/administrator/components/com_templates/views/template/tmpl/default_tree.php
+++ b/administrator/components/com_templates/views/template/tmpl/default_tree.php
@@ -12,8 +12,8 @@
 ?>
 
 <ul class='nav nav-list directory-tree'>
-	<?php foreach($this->files as $key => $value): ?>
-		<?php if(is_array($value)): ?>
+	<?php foreach ($this->files as $key => $value): ?>
+		<?php if (is_array($value)): ?>
 			<?php
 			$keyArray  = explode('/', $key);
 			$fileArray = explode('/', $this->fileName);
@@ -51,7 +51,7 @@
 				<?php echo $this->directoryTree($value); ?>
 			</li>
 		<?php endif; ?>
-		<?php if(is_object($value)): ?>
+		<?php if (is_object($value)): ?>
 			<li>
 				<a class="file nowrap" href='<?php echo JRoute::_('index.php?option=com_templates&view=template&id=' . $this->id . '&file=' . $value->id) ?>'>
 					<span class='icon-file'>&nbsp;<?php echo $value->name; ?></span>
diff --git a/administrator/components/com_users/views/user/tmpl/edit.php b/administrator/components/com_users/views/user/tmpl/edit.php
index f0b678dbb2744..57cca4c40c48b 100644
--- a/administrator/components/com_users/views/user/tmpl/edit.php
+++ b/administrator/components/com_users/views/user/tmpl/edit.php
@@ -93,7 +93,7 @@
 			</div>
 		</div>
 		<div id="com_users_twofactor_forms_container">
-			<?php foreach($this->tfaform as $form): ?>
+			<?php foreach ($this->tfaform as $form): ?>
 			<?php $style = $form['method'] == $this->otpConfig->method ? 'display: block' : 'display: none'; ?>
 			<div id="com_users_twofactor_<?php echo $form['method'] ?>" style="<?php echo $style; ?>">
 				<?php echo $form['form'] ?>
diff --git a/administrator/templates/hathor/html/com_postinstall/messages/default.php b/administrator/templates/hathor/html/com_postinstall/messages/default.php
index 98bbca301fbcc..441097064f744 100644
--- a/administrator/templates/hathor/html/com_postinstall/messages/default.php
+++ b/administrator/templates/hathor/html/com_postinstall/messages/default.php
@@ -39,7 +39,7 @@
 ?>
 	<h2><?php echo JText::_('COM_POSTINSTALL_LBL_MESSAGES') ?></h2>
 <?php endif; ?>
-	<?php foreach($this->items as $item): ?>
+	<?php foreach ($this->items as $item): ?>
 	<fieldset>
 		<legend><?php echo JText::_($item->title_key) ?></legend>
 		<p class="small">
diff --git a/administrator/templates/hathor/html/com_templates/template/default.php b/administrator/templates/hathor/html/com_templates/template/default.php
index 1df2079e16e0a..490b4c2f9f4a9 100644
--- a/administrator/templates/hathor/html/com_templates/template/default.php
+++ b/administrator/templates/hathor/html/com_templates/template/default.php
@@ -56,7 +56,7 @@
 		$(this).addClass('selected');
 	});
 });");
-if($this->type == 'image')
+if ($this->type == 'image')
 {
 	JFactory::getDocument()->addScriptDeclaration("
 		jQuery(document).ready(function() {
@@ -113,7 +113,7 @@ function clearCoords()
 		overflow-x: auto;
 	}
 ");
-if($this->type == 'font')
+if ($this->type == 'font')
 {
 	JFactory::getDocument()->addStyleDeclaration(
 			"/* Styles for font preview */
@@ -282,7 +282,7 @@ function clearCoords()
 		</form>
 	<?php endif; ?>
 
-	<?php if($this->type == 'home'): ?>
+	<?php if ($this->type == 'home'): ?>
 		<form action="<?php echo JRoute::_('index.php?option=com_templates&view=template&id=' . $input->getInt('id') . '&file=' . $this->file); ?>" method="post" name="adminForm" id="adminForm" class="form-horizontal">
 			<input type="hidden" name="task" value="" />
 			<?php echo JHtml::_('form.token'); ?>
@@ -297,7 +297,7 @@ function clearCoords()
 			</div>
 		</form>
 	<?php endif; ?>
-	<?php if($this->type == 'file'): ?>
+	<?php if ($this->type == 'file'): ?>
 		<form action="<?php echo JRoute::_('index.php?option=com_templates&view=template&id=' . $input->getInt('id') . '&file=' . $this->file); ?>" method="post" name="adminForm" id="adminForm" class="form-horizontal">
 			<fieldset class="adminform">
 				<legend><?php echo JText::_('COM_TEMPLATES_SOURCE_CODE');?></legend>
@@ -315,7 +315,7 @@ function clearCoords()
 			</fieldset>
 		</form>
 	<?php endif; ?>
-	<?php if($this->type == 'image'): ?>
+	<?php if ($this->type == 'image'): ?>
 		<div id="image-box"><img id="image-crop" src="<?php echo $this->image['address'] . '?' . time(); ?>" /></div>
 		<form action="<?php echo JRoute::_('index.php?option=com_templates&view=template&id=' . $input->getInt('id') . '&file=' . $this->file); ?>" method="post" name="adminForm" id="adminForm">
 			<input type ="hidden" id="x" name="x" />
@@ -326,7 +326,7 @@ function clearCoords()
 			<?php echo JHtml::_('form.token'); ?>
 		</form>
 	<?php endif; ?>
-	<?php if($this->type == 'archive'): ?>
+	<?php if ($this->type == 'archive'): ?>
 		<legend><?php echo JText::_('COM_TEMPLATES_FILE_CONTENT_PREVIEW'); ?></legend>
 		<form action="<?php echo JRoute::_('index.php?option=com_templates&view=template&id=' . $input->getInt('id') . '&file=' . $this->file); ?>" method="post" name="adminForm" id="adminForm" class="form-horizontal">
 			<fieldset>
@@ -348,7 +348,7 @@ function clearCoords()
 
 		</form>
 	<?php endif; ?>
-	<?php if($this->type == 'font'): ?>
+	<?php if ($this->type == 'font'): ?>
 		<div class="font-preview">
 			<form action="<?php echo JRoute::_('index.php?option=com_templates&view=template&id=' . $input->getInt('id') . '&file=' . $this->file); ?>" method="post" name="adminForm" id="adminForm" class="form-horizontal">
 				<fieldset class="adminform">
@@ -415,16 +415,16 @@ function clearCoords()
 
 <div class="width-40 fltrt">
 
-	<?php if($this->type != 'home'): ?>
+	<?php if ($this->type != 'home'): ?>
 		<fieldset class="adminform">
 			<legend><?php echo JText::_('COM_TEMPLATES_FILE_INFO');?></legend>
-			<?php if($this->type == 'file'): ?>
+			<?php if ($this->type == 'file'): ?>
 				<p><?php echo JText::sprintf('COM_TEMPLATES_TEMPLATE_FILENAME', $this->source->filename, $this->template->element); ?></p>
 			<?php endif; ?>
-			<?php if($this->type == 'image'): ?>
+			<?php if ($this->type == 'image'): ?>
 				<p><?php echo JText::sprintf('COM_TEMPLATES_TEMPLATE_FILENAME', $this->image['path'], $this->template->element); ?></p>
 			<?php endif; ?>
-			<?php if($this->type == 'font'): ?>
+			<?php if ($this->type == 'font'): ?>
 				<p><?php echo JText::sprintf('COM_TEMPLATES_TEMPLATE_FILENAME', $this->font['rel_path'], $this->template->element); ?></p>
 			<?php endif; ?>
 		</fieldset>
@@ -462,7 +462,7 @@ function clearCoords()
 	<?php  echo JHtml::_('sliders.panel', JText::_('COM_TEMPLATES_OVERRIDES_MODULES'), 'override-module'); ?>
 	<fieldset class="panelform">
 		<ul class="adminformlist">
-			<?php foreach($this->overridesList['modules'] as $module): ?>
+			<?php foreach ($this->overridesList['modules'] as $module): ?>
 				<li>
 					<a href="<?php echo JRoute::_('index.php?option=com_templates&view=template&task=template.overrides&folder=' . $module->path . '&id=' . $input->getInt('id') . '&file=' . $this->file); ?>">
 						<span class="icon-copy"></span>&nbsp;<?php echo $module->name; ?>
@@ -495,7 +495,7 @@ function clearCoords()
 	<?php  echo JHtml::_('sliders.panel', JText::_('COM_TEMPLATES_OVERRIDES_LAYOUTS'), 'override-layout'); ?>
 	<fieldset class="panelform">
 		<ul class="adminformlist">
-			<?php foreach($this->overridesList['layouts'] as $layout): ?>
+			<?php foreach ($this->overridesList['layouts'] as $layout): ?>
 				<li>
 					<a href="<?php echo JRoute::_('index.php?option=com_templates&view=template&task=template.overrides&folder=' . $layout->path . '&id=' . $input->getInt('id') . '&file=' . $this->file); ?>">
 						<span class="icon-copy"></span>&nbsp;<?php echo $layout->name; ?>
diff --git a/administrator/templates/hathor/html/com_templates/template/default_folders.php b/administrator/templates/hathor/html/com_templates/template/default_folders.php
index 6af67ce4e350d..28ffe1a75fb1d 100644
--- a/administrator/templates/hathor/html/com_templates/template/default_folders.php
+++ b/administrator/templates/hathor/html/com_templates/template/default_folders.php
@@ -12,8 +12,8 @@
 ?>
 
 <ul class='nav nav-list directory-tree'>
-	<?php foreach($this->files as $key => $value): ?>
-		<?php if(is_array($value)): ?>
+	<?php foreach ($this->files as $key => $value): ?>
+		<?php if (is_array($value)): ?>
 			<li class="folder-select">
 				<a class='folder-url nowrap' data-id='<?php echo base64_encode($key); ?>' href=''>
 					<span class='icon-folder-close'>&nbsp;<?php $explodeArray = explode('/', $key); echo end($explodeArray); ?></span>
diff --git a/administrator/templates/hathor/html/com_users/user/edit.php b/administrator/templates/hathor/html/com_users/user/edit.php
index 8a767dff6a5b9..3f13a1643006c 100644
--- a/administrator/templates/hathor/html/com_users/user/edit.php
+++ b/administrator/templates/hathor/html/com_users/user/edit.php
@@ -101,7 +101,7 @@
 			</div>
 		</div>
 		<div id="com_users_twofactor_forms_container">
-			<?php foreach($this->tfaform as $form): ?>
+			<?php foreach ($this->tfaform as $form): ?>
 			<?php $style = $form['method'] == $this->otpConfig->method ? 'display: block' : 'display: none'; ?>
 			<div id="com_users_twofactor_<?php echo $form['method'] ?>" style="<?php echo $style; ?>">
 				<?php echo $form['form'] ?>
diff --git a/components/com_contact/views/categories/tmpl/default_items.php b/components/com_contact/views/categories/tmpl/default_items.php
index 041ea24a2f232..9110e678637ac 100644
--- a/components/com_contact/views/categories/tmpl/default_items.php
+++ b/components/com_contact/views/categories/tmpl/default_items.php
@@ -14,7 +14,7 @@
 $class = ' class="first"';
 if ($this->maxLevelcat != 0 && count($this->items[$this->parent->id]) > 0) :
 ?>
-	<?php foreach($this->items[$this->parent->id] as $id => $item) : ?>
+	<?php foreach ($this->items[$this->parent->id] as $id => $item) : ?>
 		<?php
 		if ($this->params->get('show_empty_categories_cat') || $item->numitems || count($item->getChildren())) :
 			if (!isset($this->items[$this->parent->id][$id + 1]))
diff --git a/components/com_content/views/categories/tmpl/default_items.php b/components/com_content/views/categories/tmpl/default_items.php
index d524c4c5fdff3..148f8eef8b3c0 100644
--- a/components/com_content/views/categories/tmpl/default_items.php
+++ b/components/com_content/views/categories/tmpl/default_items.php
@@ -16,7 +16,7 @@
 
 if (count($this->items[$this->parent->id]) > 0 && $this->maxLevelcat != 0) :
 ?>
-	<?php foreach($this->items[$this->parent->id] as $id => $item) : ?>
+	<?php foreach ($this->items[$this->parent->id] as $id => $item) : ?>
 		<?php
 		if ($this->params->get('show_empty_categories_cat') || $item->numitems || count($item->getChildren())) :
 		if (!isset($this->items[$this->parent->id][$id + 1]))
diff --git a/components/com_finder/views/search/view.html.php b/components/com_finder/views/search/view.html.php
index ba725b9830a4d..8dfe988378859 100644
--- a/components/com_finder/views/search/view.html.php
+++ b/components/com_finder/views/search/view.html.php
@@ -74,7 +74,7 @@ public function display($tpl = null)
 		if (strpos($this->query->input, '"'))
 		{
 			// Get the application router.
-			$router =& $app::getRouter();
+			$router = &$app::getRouter();
 
 			// Fix the q variable in the URL.
 			if ($router->getVar('q') !== $this->query->input)
diff --git a/components/com_newsfeeds/views/categories/tmpl/default_items.php b/components/com_newsfeeds/views/categories/tmpl/default_items.php
index be131feb2b098..fff6a01dda698 100644
--- a/components/com_newsfeeds/views/categories/tmpl/default_items.php
+++ b/components/com_newsfeeds/views/categories/tmpl/default_items.php
@@ -14,7 +14,7 @@
 $class = ' class="first"';
 if (count($this->items[$this->parent->id]) > 0 && $this->maxLevelcat != 0) :
 ?>
-	<?php foreach($this->items[$this->parent->id] as $id => $item) : ?>
+	<?php foreach ($this->items[$this->parent->id] as $id => $item) : ?>
 		<?php
 		if ($this->params->get('show_empty_categories_cat') || $item->numitems || count($item->getChildren())) :
 			if (!isset($this->items[$this->parent->id][$id + 1]))
diff --git a/components/com_tags/views/tags/view.html.php b/components/com_tags/views/tags/view.html.php
index dc8a7d1e23725..8a01ee638f2be 100644
--- a/components/com_tags/views/tags/view.html.php
+++ b/components/com_tags/views/tags/view.html.php
@@ -122,7 +122,7 @@ public function display($tpl = null)
 				}
 			}
 		}
-		elseif(!empty($items[0]))
+		elseif (!empty($items[0]))
 		{
 			// Merge so that tag params take priority
 			$temp->merge($items[0]->params);
diff --git a/components/com_users/views/profile/tmpl/edit.php b/components/com_users/views/profile/tmpl/edit.php
index 01e06f4ba0fe4..ecd48f737817b 100644
--- a/components/com_users/views/profile/tmpl/edit.php
+++ b/components/com_users/views/profile/tmpl/edit.php
@@ -100,7 +100,7 @@
 				</div>
 			</div>
 			<div id="com_users_twofactor_forms_container">
-				<?php foreach($this->twofactorform as $form) : ?>
+				<?php foreach ($this->twofactorform as $form) : ?>
 				<?php $style = $form['method'] == $this->otpConfig->method ? 'display: block' : 'display: none'; ?>
 				<div id="com_users_twofactor_<?php echo $form['method']; ?>" style="<?php echo $style; ?>">
 					<?php echo $form['form']; ?>
diff --git a/installation/view/summary/tmpl/default.php b/installation/view/summary/tmpl/default.php
index f85356bc1acfd..b955ff9d7a545 100644
--- a/installation/view/summary/tmpl/default.php
+++ b/installation/view/summary/tmpl/default.php
@@ -224,7 +224,7 @@
 							</span>
 						</td>
 					</tr>
-					<?php if($this->options['ftp_enable']) : ?>
+					<?php if ($this->options['ftp_enable']) : ?>
 					<tr>
 						<td class="item">
 							<?php echo JText::_('INSTL_FTP_USER_LABEL'); ?>
diff --git a/layouts/joomla/edit/frontediting_modules.php b/layouts/joomla/edit/frontediting_modules.php
index 477d7a0180612..601e7ef6d95a1 100644
--- a/layouts/joomla/edit/frontediting_modules.php
+++ b/layouts/joomla/edit/frontediting_modules.php
@@ -11,7 +11,7 @@
 
 // JLayout for standard handling of the edit modules:
 
-$moduleHtml   =& $displayData['moduleHtml'];
+$moduleHtml   = &$displayData['moduleHtml'];
 $mod          = $displayData['module'];
 $position     = $displayData['position'];
 $menusEditing = $displayData['menusediting'];
diff --git a/layouts/joomla/form/field/subform/default.php b/layouts/joomla/form/field/subform/default.php
index 9c645ce9bbe35..69b8bdf20c5b2 100644
--- a/layouts/joomla/form/field/subform/default.php
+++ b/layouts/joomla/form/field/subform/default.php
@@ -30,7 +30,7 @@
 ?>
 
 <div class="subform-wrapper">
-<?php foreach($form->getGroup('') as $field): ?>
+<?php foreach ($form->getGroup('') as $field): ?>
 	<?php echo $field->renderField(); ?>
 <?php endforeach; ?>
 </div>
diff --git a/layouts/joomla/form/field/subform/repeatable-table.php b/layouts/joomla/form/field/subform/repeatable-table.php
index d5babf2df7d26..74aeba7e3c41c 100644
--- a/layouts/joomla/form/field/subform/repeatable-table.php
+++ b/layouts/joomla/form/field/subform/repeatable-table.php
@@ -38,7 +38,7 @@
 
 if (!empty($groupByFieldset))
 {
-	foreach($tmpl->getFieldsets() as $fieldset) {
+	foreach ($tmpl->getFieldsets() as $fieldset) {
 		$table_head .= '<th>' . JText::_($fieldset->label);
 
 		if (!empty($fieldset->description))
@@ -53,7 +53,7 @@
 }
 else
 {
-	foreach($tmpl->getGroup('') as $field) {
+	foreach ($tmpl->getGroup('') as $field) {
 		$table_head .= '<th>' . strip_tags($field->label);
 		$table_head .= '<br /><small style="font-weight:normal">' . JText::_($field->description) . '</small>';
 		$table_head .= '</th>';
@@ -88,7 +88,7 @@
 			</thead>
 			<tbody>
 			<?php
-			foreach($forms as $k => $form):
+			foreach ($forms as $k => $form):
 				echo $this->sublayout($sublayout, array('form' => $form, 'basegroup' => $fieldname, 'group' => $fieldname . $k, 'buttons' => $buttons));
 			endforeach;
 			?>
diff --git a/layouts/joomla/form/field/subform/repeatable-table/section-byfieldsets.php b/layouts/joomla/form/field/subform/repeatable-table/section-byfieldsets.php
index 353c10adf37a0..4b7ebc08791e7 100644
--- a/layouts/joomla/form/field/subform/repeatable-table/section-byfieldsets.php
+++ b/layouts/joomla/form/field/subform/repeatable-table/section-byfieldsets.php
@@ -22,9 +22,9 @@
 ?>
 
 <tr class="subform-repeatable-group" data-base-name="<?php echo $basegroup; ?>" data-group="<?php echo $group; ?>">
-	<?php foreach($form->getFieldsets() as $fieldset): ?>
+	<?php foreach ($form->getFieldsets() as $fieldset): ?>
 	<td class="<?php if (!empty($fieldset->class)){ echo $fieldset->class; } ?>">
-		<?php foreach($form->getFieldset($fieldset->name) as $field): ?>
+		<?php foreach ($form->getFieldset($fieldset->name) as $field): ?>
 			<?php echo $field->renderField(); ?>
 		<?php endforeach; ?>
 	</td>
diff --git a/layouts/joomla/form/field/subform/repeatable-table/section.php b/layouts/joomla/form/field/subform/repeatable-table/section.php
index 10c40a38f74c0..6c42714f540d4 100644
--- a/layouts/joomla/form/field/subform/repeatable-table/section.php
+++ b/layouts/joomla/form/field/subform/repeatable-table/section.php
@@ -22,7 +22,7 @@
 ?>
 
 <tr class="subform-repeatable-group" data-base-name="<?php echo $basegroup; ?>" data-group="<?php echo $group; ?>">
-	<?php foreach($form->getGroup('') as $field): ?>
+	<?php foreach ($form->getGroup('') as $field): ?>
 	<td>
 		<?php echo $field->renderField(); ?>
 	</td>
diff --git a/layouts/joomla/form/field/subform/repeatable.php b/layouts/joomla/form/field/subform/repeatable.php
index d465b129eb1cd..9dc1ba83505ac 100644
--- a/layouts/joomla/form/field/subform/repeatable.php
+++ b/layouts/joomla/form/field/subform/repeatable.php
@@ -49,7 +49,7 @@
 			</div>
 			<?php endif; ?>
 		<?php
-		foreach($forms as $k => $form):
+		foreach ($forms as $k => $form):
 			echo $this->sublayout($sublayout, array('form' => $form, 'basegroup' => $fieldname, 'group' => $fieldname . $k, 'buttons' => $buttons));
 		endforeach;
 		?>
diff --git a/layouts/joomla/form/field/subform/repeatable/section-byfieldsets.php b/layouts/joomla/form/field/subform/repeatable/section-byfieldsets.php
index 90e6cd4051b69..f42906fd7c91b 100644
--- a/layouts/joomla/form/field/subform/repeatable/section-byfieldsets.php
+++ b/layouts/joomla/form/field/subform/repeatable/section-byfieldsets.php
@@ -31,12 +31,12 @@
 	</div>
 	<?php endif; ?>
 	<div class="row-fluid">
-<?php foreach($form->getFieldsets() as $fieldset): ?>
+<?php foreach ($form->getFieldsets() as $fieldset): ?>
 <fieldset class="<?php if (!empty($fieldset->class)){ echo $fieldset->class; } ?>">
 	<?php if (!empty($fieldset->label)):?>
 	<legend><?php echo JText::_($fieldset->label); ?></legend>
 	<?php endif; ?>
-<?php foreach($form->getFieldset($fieldset->name) as $field): ?>
+<?php foreach ($form->getFieldset($fieldset->name) as $field): ?>
 	<?php echo $field->renderField(); ?>
 <?php endforeach; ?>
 </fieldset>
diff --git a/layouts/joomla/form/field/subform/repeatable/section.php b/layouts/joomla/form/field/subform/repeatable/section.php
index 6f14ffc22fe11..3d3b5c216a353 100644
--- a/layouts/joomla/form/field/subform/repeatable/section.php
+++ b/layouts/joomla/form/field/subform/repeatable/section.php
@@ -32,7 +32,7 @@
 	</div>
 	<?php endif; ?>
 
-<?php foreach($form->getGroup('') as $field): ?>
+<?php foreach ($form->getGroup('') as $field): ?>
 	<?php echo $field->renderField(); ?>
 <?php endforeach; ?>
 </div>
diff --git a/templates/beez3/html/com_content/category/blog_item.php b/templates/beez3/html/com_content/category/blog_item.php
index 71fbe6fffcb18..404246c7763be 100644
--- a/templates/beez3/html/com_content/category/blog_item.php
+++ b/templates/beez3/html/com_content/category/blog_item.php
@@ -8,7 +8,7 @@
  */
 defined('_JEXEC') or die;
 
-$params =& $this->item->params;
+$params = &$this->item->params;
 $images = json_decode($this->item->images);
 $app = JFactory::getApplication();
 $canEdit = $this->item->params->get('access-edit');
diff --git a/templates/beez3/html/com_content/category/blog_links.php b/templates/beez3/html/com_content/category/blog_links.php
index cc40fc2e008f7..71b377968e693 100644
--- a/templates/beez3/html/com_content/category/blog_links.php
+++ b/templates/beez3/html/com_content/category/blog_links.php
@@ -9,7 +9,7 @@
 
 defined('_JEXEC') or die;
 
-$params =& $this->item->params;
+$params = &$this->item->params;
 $app = JFactory::getApplication();
 
 JHtml::addIncludePath(JPATH_COMPONENT . '/helpers');
diff --git a/templates/protostar/error.php b/templates/protostar/error.php
index a4fecd31e28d7..7592615d93efe 100644
--- a/templates/protostar/error.php
+++ b/templates/protostar/error.php
@@ -25,7 +25,7 @@
 $itemid   = $app->input->getCmd('Itemid', '');
 $sitename = $app->get('sitename');
 
-if($task == "edit" || $layout == "form" )
+if ($task == "edit" || $layout == "form" )
 {
 	$fullWidth = 1;
 }
diff --git a/templates/protostar/index.php b/templates/protostar/index.php
index b4192eef17001..0da6954a000c6 100644
--- a/templates/protostar/index.php
+++ b/templates/protostar/index.php
@@ -28,7 +28,7 @@
 $itemid   = $app->input->getCmd('Itemid', '');
 $sitename = $app->get('sitename');
 
-if($task == "edit" || $layout == "form" )
+if ($task == "edit" || $layout == "form" )
 {
 	$fullWidth = 1;
 }
diff --git a/tests/unit/core/helper/helper.php b/tests/unit/core/helper/helper.php
index 63af3c919fd85..80ed811e93006 100644
--- a/tests/unit/core/helper/helper.php
+++ b/tests/unit/core/helper/helper.php
@@ -68,14 +68,14 @@ public static function registerDeprecationHandler()
 				$class  = isset($trace[$i]['object']) ? get_class($trace[$i]['object']) : $trace[$i]['class'];
 				$method = $trace[$i]['function'];
 
-				$ref =& $deprecations[$group][$msg]['count'];
+				$ref = &$deprecations[$group][$msg]['count'];
 				$ref++;
-				$ref =& $deprecations[$group][$msg][$class . '::' . $method];
+				$ref = &$deprecations[$group][$msg][$class . '::' . $method];
 				$ref++;
 			}
 			else
 			{
-				$ref =& $deprecations[$group][$msg]['count'];
+				$ref = &$deprecations[$group][$msg]['count'];
 				$ref++;
 			}
 
diff --git a/tests/unit/suites/libraries/cms/pagination/JPaginationTest.php b/tests/unit/suites/libraries/cms/pagination/JPaginationTest.php
index 6346e7a6b9264..bcf169011a117 100644
--- a/tests/unit/suites/libraries/cms/pagination/JPaginationTest.php
+++ b/tests/unit/suites/libraries/cms/pagination/JPaginationTest.php
@@ -832,7 +832,7 @@ public function testSet($property, $value, $expected)
 		{
 			$result = TestReflection::getValue($pagination, $property);
 		}
-		elseif(strpos($property, '.'))
+		elseif (strpos($property, '.'))
 		{
 			$prop = explode('.', $property);
 			$prop[1] = ucfirst($prop[1]);
diff --git a/tests/unit/suites/libraries/joomla/archive/JArchiveTestCase.php b/tests/unit/suites/libraries/joomla/archive/JArchiveTestCase.php
index 91f3679e1c731..e62e6a54eed3e 100644
--- a/tests/unit/suites/libraries/joomla/archive/JArchiveTestCase.php
+++ b/tests/unit/suites/libraries/joomla/archive/JArchiveTestCase.php
@@ -62,7 +62,7 @@ protected function tearDown()
 		if (is_dir($this->outputPath))
 		{
 			// delete files in output directory
-			foreach(glob("{$this->outputPath}/*") as $file)
+			foreach (glob("{$this->outputPath}/*") as $file)
 			{
 				unlink($file);
 			}

From f6046e53d139ab7d7a379f8888536637cd4b0940 Mon Sep 17 00:00:00 2001
From: Nicola Galgano <optimus4joomla@gmail.com>
Date: Tue, 6 Dec 2016 23:26:41 +0100
Subject: [PATCH 29/39] [com_tags] - correct tfoot colspan (#13023)

* [com_tags] - correct tfoot colspan

correct tfoot colspan when count items active

* uniform style

uniform style

* fix existing columns

fix existing columns
---
 .../components/com_tags/views/tags/tmpl/default.php        | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/administrator/components/com_tags/views/tags/tmpl/default.php b/administrator/components/com_tags/views/tags/tmpl/default.php
index 46623a019a7d8..1c1e5d279ec10 100644
--- a/administrator/components/com_tags/views/tags/tmpl/default.php
+++ b/administrator/components/com_tags/views/tags/tmpl/default.php
@@ -29,6 +29,7 @@
 $component = $parts[0];
 $section   = null;
 $mode      = false;
+$columns   = 7;
 
 if (count($parts) > 1)
 {
@@ -93,21 +94,25 @@
 							<th width="1%" class="nowrap center hidden-phone">
 								<i class="icon-publish hasTooltip" title="<?php echo JText::_('COM_TAGS_COUNT_PUBLISHED_ITEMS'); ?>"></i>
 							</th>
+							<?php $columns++; ?>
 						<?php endif;?>
 						<?php if (isset($this->items[0]) && property_exists($this->items[0], 'count_unpublished')) :?>
 							<th width="1%" class="nowrap center hidden-phone">
 								<i class="icon-unpublish hasTooltip" title="<?php echo JText::_('COM_TAGS_COUNT_UNPUBLISHED_ITEMS'); ?>"></i>
 							</th>
+							<?php $columns++; ?>
 						<?php endif;?>
 						<?php if (isset($this->items[0]) && property_exists($this->items[0], 'count_archived')) :?>
 							<th width="1%" class="nowrap center hidden-phone">
 								<i class="icon-archive hasTooltip" title="<?php echo JText::_('COM_TAGS_COUNT_ARCHIVED_ITEMS'); ?>"></i>
 							</th>
+							<?php $columns++; ?>
 						<?php endif;?>
 						<?php if (isset($this->items[0]) && property_exists($this->items[0], 'count_trashed')) :?>
 							<th width="1%" class="nowrap center hidden-phone">
 								<i class="icon-trash hasTooltip" title="<?php echo JText::_('COM_TAGS_COUNT_TRASHED_ITEMS'); ?>"></i>
 							</th>
+							<?php $columns++; ?>
 						<?php endif;?>
  
 						<th width="10%" class="nowrap hidden-phone">
@@ -123,7 +128,7 @@
 				</thead>
 				<tfoot>
 					<tr>
-						<td colspan="7">
+						<td colspan="<?php echo $columns; ?>">
 							<?php echo $this->pagination->getListFooter(); ?>
 						</td>
 					</tr>

From ad1ff7c5006ea0ad7df7b57f29b75c1df4c73749 Mon Sep 17 00:00:00 2001
From: andrepereiradasilva <andrepereiradasilva@users.noreply.github.com>
Date: Tue, 6 Dec 2016 22:27:10 +0000
Subject: [PATCH 30/39] [modules db table] Add default to content db field in
 mysql (already like that is postgresql and sqlsrv) (#13035)

* add default to content

* Update 3.7.0-2016-11-27.sql
---
 .../components/com_admin/sql/updates/mysql/3.7.0-2016-11-27.sql | 2 ++
 installation/sql/mysql/joomla.sql                               | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 administrator/components/com_admin/sql/updates/mysql/3.7.0-2016-11-27.sql

diff --git a/administrator/components/com_admin/sql/updates/mysql/3.7.0-2016-11-27.sql b/administrator/components/com_admin/sql/updates/mysql/3.7.0-2016-11-27.sql
new file mode 100644
index 0000000000000..f6874ee5a5c36
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/mysql/3.7.0-2016-11-27.sql
@@ -0,0 +1,2 @@
+-- Normalize modules content field with other db systems. Add default value.
+ALTER TABLE `#__modules` MODIFY `content` text NOT NULL DEFAULT '';
diff --git a/installation/sql/mysql/joomla.sql b/installation/sql/mysql/joomla.sql
index 83e0b87bf215d..9f27f22be1a36 100644
--- a/installation/sql/mysql/joomla.sql
+++ b/installation/sql/mysql/joomla.sql
@@ -1447,7 +1447,7 @@ CREATE TABLE IF NOT EXISTS `#__modules` (
   `asset_id` int(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',
   `title` varchar(100) NOT NULL DEFAULT '',
   `note` varchar(255) NOT NULL DEFAULT '',
-  `content` text NOT NULL,
+  `content` text NOT NULL DEFAULT '',
   `ordering` int(11) NOT NULL DEFAULT 0,
   `position` varchar(50) NOT NULL DEFAULT '',
   `checked_out` int(10) unsigned NOT NULL DEFAULT 0,

From c7614dc22154947acccb97338589e10d1084a769 Mon Sep 17 00:00:00 2001
From: Alex B <shur@users.noreply.github.com>
Date: Wed, 7 Dec 2016 01:27:53 +0300
Subject: [PATCH 31/39] [mod-menu] code style changes (#13042)

* code style changes

* we already have $aliasToId

* Update default.php

* Update default.php
---
 modules/mod_menu/tmpl/default.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/modules/mod_menu/tmpl/default.php b/modules/mod_menu/tmpl/default.php
index 1b07f916b7855..17c52b0d48c7a 100644
--- a/modules/mod_menu/tmpl/default.php
+++ b/modules/mod_menu/tmpl/default.php
@@ -28,8 +28,7 @@
 		$class .= ' default';
 	}
 
-
-	if (($item->id == $active_id) || ($item->type == 'alias' && $item->params->get('aliasoptions') == $active_id))
+	if ($item->id == $active_id || ($item->type == 'alias' && $item->params->get('aliasoptions') == $active_id))
 	{
 		$class .= ' current';
 	}

From 2627572eb535721f938ebc9a5476fd8253feda4b Mon Sep 17 00:00:00 2001
From: Thomas Hunziker <werbemails@bakual.ch>
Date: Tue, 6 Dec 2016 23:28:30 +0100
Subject: [PATCH 32/39] Check if batchSelector is defined. (#13053)

---
 layouts/joomla/html/batch/language.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/layouts/joomla/html/batch/language.php b/layouts/joomla/html/batch/language.php
index e7e43e0197c52..0e57bbd2fbbbf 100644
--- a/layouts/joomla/html/batch/language.php
+++ b/layouts/joomla/html/batch/language.php
@@ -21,7 +21,7 @@
 			if ($("#batch-category-id").length){var batchSelector = $("#batch-category-id");}
 			if ($("#batch-menu-id").length){var batchSelector = $("#batch-menu-id");}
 			if ($("#batch-position-id").length){var batchSelector = $("#batch-position-id");}
-			if ($("#batch-copy-move").length) {
+			if ($("#batch-copy-move").length && batchSelector) {
 				$("#batch-copy-move").hide();
 				batchSelector.on("change", function(){
 					if (batchSelector.val() != 0 || batchSelector.val() != "") {

From 6d5612c0692204c3201c7774db9e13c1a925d352 Mon Sep 17 00:00:00 2001
From: Tomasz Narloch <csthomas@users.noreply.github.com>
Date: Tue, 6 Dec 2016 23:28:51 +0100
Subject: [PATCH 33/39] JComponent::isEnabled should always return boolean
 (#13061)

---
 libraries/cms/component/helper.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/libraries/cms/component/helper.php b/libraries/cms/component/helper.php
index 8402b4d72cc6c..347e3d465631b 100644
--- a/libraries/cms/component/helper.php
+++ b/libraries/cms/component/helper.php
@@ -75,9 +75,7 @@ public static function getComponent($option, $strict = false)
 	 */
 	public static function isEnabled($option)
 	{
-		$result = static::getComponent($option, true);
-
-		return $result->enabled;
+		return (bool) static::getComponent($option, true)->enabled;
 	}
 
 	/**

From 5fc53aa65b3e0aa971784da6fb69cdf3e6e3c8e4 Mon Sep 17 00:00:00 2001
From: Michael Babker <mbabker@flbab.com>
Date: Tue, 6 Dec 2016 16:30:48 -0600
Subject: [PATCH 34/39] Create a JMenuItem object to represent menu items in
 the JMenu API (#13073)

---
 libraries/cms/menu/item.php | 290 ++++++++++++++++++++++++++++++++++++
 libraries/cms/menu/menu.php |  17 +--
 libraries/cms/menu/site.php |   2 +-
 3 files changed, 292 insertions(+), 17 deletions(-)
 create mode 100644 libraries/cms/menu/item.php

diff --git a/libraries/cms/menu/item.php b/libraries/cms/menu/item.php
new file mode 100644
index 0000000000000..c777c0bd362bc
--- /dev/null
+++ b/libraries/cms/menu/item.php
@@ -0,0 +1,290 @@
+<?php
+/**
+ * @package     Joomla.Libraries
+ * @subpackage  Menu
+ *
+ * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\Registry\Registry;
+
+/**
+ * Object representing a menu item
+ *
+ * @since  __DEPLOY_VERSION__
+ */
+class JMenuItem extends JObject
+{
+	/**
+	 * Primary key
+	 *
+	 * @var    integer
+	 * @since  __DEPLOY_VERSION__
+	 */
+	public $id;
+
+	/**
+	 * The type of menu this item belongs to
+	 *
+	 * @var    integer
+	 * @since  __DEPLOY_VERSION__
+	 */
+	public $menutype;
+
+	/**
+	 * The display title of the menu item
+	 *
+	 * @var    string
+	 * @since  __DEPLOY_VERSION__
+	 */
+	public $title;
+
+	/**
+	 * The SEF alias of the menu item
+	 *
+	 * @var    string
+	 * @since  __DEPLOY_VERSION__
+	 */
+	public $alias;
+
+	/**
+	 * A note associated with the menu item
+	 *
+	 * @var    string
+	 * @since  __DEPLOY_VERSION__
+	 */
+	public $note;
+
+	/**
+	 * The computed path of the menu item based on the alias field, this is populated from the `path` field in the `#__menu` table
+	 *
+	 * @var    string
+	 * @since  __DEPLOY_VERSION__
+	 */
+	public $route;
+
+	/**
+	 * The actual link the menu item refers to
+	 *
+	 * @var    string
+	 * @since  __DEPLOY_VERSION__
+	 */
+	public $link;
+
+	/**
+	 * The type of link
+	 *
+	 * @var    string
+	 * @since  __DEPLOY_VERSION__
+	 */
+	public $type;
+
+	/**
+	 * The relative level in the tree
+	 *
+	 * @var    integer
+	 * @since  __DEPLOY_VERSION__
+	 */
+	public $level;
+
+	/**
+	 * The assigned language for this item
+	 *
+	 * @var    string
+	 * @since  __DEPLOY_VERSION__
+	 */
+	public $language;
+
+	/**
+	 * The click behaviour of the link
+	 *
+	 * @var    string
+	 * @since  __DEPLOY_VERSION__
+	 */
+	public $browserNav;
+
+	/**
+	 * The access level required to view the menu item
+	 *
+	 * @var    integer
+	 * @since  __DEPLOY_VERSION__
+	 */
+	public $access;
+
+	/**
+	 * The menu item parameters
+	 *
+	 * @var    string|Registry
+	 * @since  __DEPLOY_VERSION__
+	 * @note   This field is protected to require reading this field to proxy through the getter to convert the params to a Registry instance
+	 */
+	protected $params;
+
+	/**
+	 * Indicates if this menu item is the home or default page
+	 *
+	 * @var    integer
+	 * @since  __DEPLOY_VERSION__
+	 */
+	public $home;
+
+	/**
+	 * The image of the menu item
+	 *
+	 * @var    string
+	 * @since  __DEPLOY_VERSION__
+	 */
+	public $img;
+
+	/**
+	 * The optional template style applied to this menu item
+	 *
+	 * @var    integer
+	 * @since  __DEPLOY_VERSION__
+	 */
+	public $template_style_id;
+
+	/**
+	 * The extension ID of the component this menu item is for
+	 *
+	 * @var    integer
+	 * @since  __DEPLOY_VERSION__
+	 */
+	public $component_id;
+
+	/**
+	 * The parent menu item in the menu tree
+	 *
+	 * @var    integer
+	 * @since  __DEPLOY_VERSION__
+	 */
+	public $parent_id;
+
+	/**
+	 * The name of the component this menu item is for
+	 *
+	 * @var    string
+	 * @since  __DEPLOY_VERSION__
+	 */
+	public $component;
+
+	/**
+	 * The tree of parent menu items
+	 *
+	 * @var    array
+	 * @since  __DEPLOY_VERSION__
+	 */
+	public $tree = array();
+
+	/**
+	 * An array of the query string values for this item
+	 *
+	 * @var    array
+	 * @since  __DEPLOY_VERSION__
+	 */
+	public $query = array();
+
+	/**
+	 * Class constructor
+	 *
+	 * @param   array  $data  The menu item data to load
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function __construct($data = array())
+	{
+		foreach ((array) $data as $key => $value)
+		{
+			$this->$key = $value;
+		}
+	}
+
+	/**
+	 * Method to get certain otherwise inaccessible properties from the form field object.
+	 *
+	 * @param   string  $name  The property name for which to the the value.
+	 *
+	 * @return  mixed  The property value or null.
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 * @deprecated  4.0  Access the item parameters through the `getParams()` method
+	 */
+	public function __get($name)
+	{
+		if ($name === 'params')
+		{
+			return $this->getParams();
+		}
+
+		return $this->get($name);
+	}
+
+	/**
+	 * Method to set certain otherwise inaccessible properties of the form field object.
+	 *
+	 * @param   string  $name   The property name for which to the the value.
+	 * @param   mixed   $value  The value of the property.
+	 *
+	 * @return  void
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 * @deprecated  4.0  Set the item parameters through the `setParams()` method
+	 */
+	public function __set($name, $value)
+	{
+		if ($name === 'params')
+		{
+			$this->setParams($value);
+
+			return;
+		}
+
+		$this->set($name, $value);
+	}
+
+	/**
+	 * Returns the menu item parameters
+	 *
+	 * @return  Registry
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function getParams()
+	{
+		if (!($this->params instanceof Registry))
+		{
+			try
+			{
+				$this->params = new Registry($this->params);
+			}
+			catch (RuntimeException $e)
+			{
+				/*
+				 * Joomla shipped with a broken sample json string for 4 years which caused fatals with new
+				 * error checks. So for now we catch the exception here - but one day we should remove it and require
+				 * valid JSON.
+				 */
+				$this->params = new Registry;
+			}
+		}
+
+		return $this->params;
+	}
+
+	/**
+	 * Sets the menu item parameters
+	 *
+	 * @param   Registry|string  $params  The data to be stored as the parameters
+	 *
+	 * @return  void
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function setParams($params)
+	{
+		$this->params = $params;
+	}
+}
diff --git a/libraries/cms/menu/menu.php b/libraries/cms/menu/menu.php
index f302b72f6769e..3d895af8e908a 100644
--- a/libraries/cms/menu/menu.php
+++ b/libraries/cms/menu/menu.php
@@ -21,7 +21,7 @@ class JMenu
 	/**
 	 * Array to hold the menu items
 	 *
-	 * @var    array
+	 * @var    JMenuItem[]
 	 * @since  1.5
 	 * @deprecated  4.0  Will convert to $items
 	 */
@@ -79,21 +79,6 @@ public function __construct($options = array())
 			{
 				$this->_default[trim($item->language)] = $item->id;
 			}
-
-			// Decode the item params
-			try
-			{
-				$item->params = new Registry($item->params);
-			}
-			catch (RuntimeException $e)
-			{
-				/**
-				 * Joomla shipped with a broken sample json string for 4 years which caused fatals with new
-				 * error checks. So for now we catch the exception here - but one day we should remove it and require
-				 * valid JSON.
-				 */
-				$item->params = new Registry;
-			}
 		}
 
 		$this->user = isset($options['user']) && $options['user'] instanceof JUser ? $options['user'] : JFactory::getUser();
diff --git a/libraries/cms/menu/site.php b/libraries/cms/menu/site.php
index 83af9e496f11f..71f2eb516202e 100644
--- a/libraries/cms/menu/site.php
+++ b/libraries/cms/menu/site.php
@@ -91,7 +91,7 @@ function () use ($db)
 					// Set the query
 					$db->setQuery($query);
 
-					return $db->loadObjectList('id');
+					return $db->loadObjectList('id', 'JMenuItem');
 				},
 				array(),
 				md5(get_class($this)),

From 25944b22a0ca971393539259de74a9337c8c2bee Mon Sep 17 00:00:00 2001
From: Thomas Hunziker <werbemails@bakual.ch>
Date: Tue, 6 Dec 2016 23:31:31 +0100
Subject: [PATCH 35/39] Always show the release news in the right side of
 postinstall (#13087)

* Always show the release news in the right side of postinstall

* Hathor
---
 .../views/messages/tmpl/default.php           | 64 +++++++++----------
 .../html/com_postinstall/messages/default.php | 20 ++++--
 2 files changed, 47 insertions(+), 37 deletions(-)

diff --git a/administrator/components/com_postinstall/views/messages/tmpl/default.php b/administrator/components/com_postinstall/views/messages/tmpl/default.php
index d9be8477f52ba..156961e08179a 100644
--- a/administrator/components/com_postinstall/views/messages/tmpl/default.php
+++ b/administrator/components/com_postinstall/views/messages/tmpl/default.php
@@ -33,41 +33,42 @@
 	<?php echo JHtml::_('select.genericlist', $this->extension_options, 'eid', array('onchange' => 'this.form.submit()', 'class' => 'input-xlarge'), 'value', 'text', $this->eid, 'eid'); ?>
 </form>
 
-<?php if (empty($this->items)) : ?>
-<div class="hero-unit">
-	<h2><?php echo JText::_('COM_POSTINSTALL_LBL_NOMESSAGES_TITLE'); ?></h2>
-	<p><?php echo JText::_('COM_POSTINSTALL_LBL_NOMESSAGES_DESC'); ?></p>
-	<a href="index.php?option=com_postinstall&amp;view=messages&amp;task=reset&amp;eid=<?php echo $this->eid; ?>&amp;<?php echo $this->token; ?>=1" class="btn btn-warning btn-large">
-		<span class="icon icon-eye-open"></span>
-		<?php echo JText::_('COM_POSTINSTALL_BTN_RESET'); ?>
-	</a>
-</div>
-<?php else : ?>
 <?php if ($this->eid == 700) : ?>
 <div class="row-fluid">
 	<div class="span8">
 <?php endif; ?>
-	<?php foreach ($this->items as $item) : ?>
-	<fieldset>
-		<legend><?php echo JText::_($item->title_key); ?></legend>
-		<p class="small">
-			<?php echo JText::sprintf('COM_POSTINSTALL_LBL_SINCEVERSION', $item->version_introduced); ?>
-		</p>
-		<p><?php echo JText::_($item->description_key); ?></p>
-		<div>
-			<?php if ($item->type !== 'message') : ?>
-			<a href="index.php?option=com_postinstall&amp;view=messages&amp;task=action&amp;id=<?php echo $item->postinstall_message_id; ?>&amp;<?php echo $this->token; ?>=1" class="btn btn-primary">
-				<?php echo JText::_($item->action_key); ?>
-			</a>
-			<?php endif; ?>
-			<?php if (JFactory::getUser()->authorise('core.edit.state', 'com_postinstall')) : ?>
-			<a href="index.php?option=com_postinstall&amp;view=message&amp;task=unpublish&amp;id=<?php echo $item->postinstall_message_id; ?>&amp;<?php echo $this->token; ?>=1" class="btn btn-inverse btn-small">
-				<?php echo JText::_('COM_POSTINSTALL_BTN_HIDE'); ?>
-			</a>
-			<?php endif; ?>
-		</div>
-	</fieldset>
-	<?php endforeach; ?>
+		<?php if (empty($this->items)) : ?>
+			<div class="hero-unit">
+				<h2><?php echo JText::_('COM_POSTINSTALL_LBL_NOMESSAGES_TITLE'); ?></h2>
+				<p><?php echo JText::_('COM_POSTINSTALL_LBL_NOMESSAGES_DESC'); ?></p>
+				<a href="index.php?option=com_postinstall&amp;view=messages&amp;task=reset&amp;eid=<?php echo $this->eid; ?>&amp;<?php echo $this->token; ?>=1" class="btn btn-warning btn-large">
+					<span class="icon icon-eye-open"></span>
+					<?php echo JText::_('COM_POSTINSTALL_BTN_RESET'); ?>
+				</a>
+			</div>
+		<?php else : ?>
+			<?php foreach ($this->items as $item) : ?>
+			<fieldset>
+				<legend><?php echo JText::_($item->title_key); ?></legend>
+				<p class="small">
+					<?php echo JText::sprintf('COM_POSTINSTALL_LBL_SINCEVERSION', $item->version_introduced); ?>
+				</p>
+				<p><?php echo JText::_($item->description_key); ?></p>
+				<div>
+					<?php if ($item->type !== 'message') : ?>
+					<a href="index.php?option=com_postinstall&amp;view=messages&amp;task=action&amp;id=<?php echo $item->postinstall_message_id; ?>&amp;<?php echo $this->token; ?>=1" class="btn btn-primary">
+						<?php echo JText::_($item->action_key); ?>
+					</a>
+					<?php endif; ?>
+					<?php if (JFactory::getUser()->authorise('core.edit.state', 'com_postinstall')) : ?>
+					<a href="index.php?option=com_postinstall&amp;view=message&amp;task=unpublish&amp;id=<?php echo $item->postinstall_message_id; ?>&amp;<?php echo $this->token; ?>=1" class="btn btn-inverse btn-small">
+						<?php echo JText::_('COM_POSTINSTALL_BTN_HIDE'); ?>
+					</a>
+					<?php endif; ?>
+				</div>
+			</fieldset>
+			<?php endforeach; ?>
+		<?php endif; ?>
 <?php if ($this->eid == 700) : ?>
 	</div>
 	<div class="span4">
@@ -76,4 +77,3 @@
 	</div>
 </div>
 <?php endif; ?>
-<?php endif; ?>
diff --git a/administrator/templates/hathor/html/com_postinstall/messages/default.php b/administrator/templates/hathor/html/com_postinstall/messages/default.php
index 441097064f744..75ed564ea3b7f 100644
--- a/administrator/templates/hathor/html/com_postinstall/messages/default.php
+++ b/administrator/templates/hathor/html/com_postinstall/messages/default.php
@@ -19,17 +19,27 @@
 						"rssitems" => 5,
 						"rssitemdesc" => 1,
 						"word_count" => 200,
-						"cache" => 0);
+						"cache" => 0,
+						"moduleclass_sfx" => ' list-striped');
 $params         = array('params' => json_encode($param));
 ?>
 
 <?php if (empty($this->items)): ?>
 <h2><?php echo JText::_('COM_POSTINSTALL_LBL_NOMESSAGES_TITLE') ?></h2>
 <p><?php echo JText::_('COM_POSTINSTALL_LBL_NOMESSAGES_DESC') ?></p>
-<button onclick="window.location='index.php?option=com_postinstall&view=messages&task=reset&eid=<?php echo $this->eid; ?>&<?php echo $this->token ?>=1'; return false;" class="btn btn-warning">
-	<span class="icon icon-eye-open"></span>
-	<?php echo JText::_('COM_POSTINSTALL_BTN_RESET') ?>
-</button>
+<div>
+	<button onclick="window.location='index.php?option=com_postinstall&view=messages&task=reset&eid=<?php echo $this->eid; ?>&<?php echo $this->token ?>=1'; return false;" class="btn btn-warning">
+		<span class="icon icon-eye-open"></span>
+		<?php echo JText::_('COM_POSTINSTALL_BTN_RESET') ?>
+	</button>
+</div>
+<?php if ($this->eid == 700): ?>
+	<br/>
+	<div>
+		<h3><?php echo JText::_('COM_POSTINSTALL_LBL_RELEASENEWS'); ?></h3>
+		<?php echo $renderer->render($mod, $params, $options); ?>
+	</div>
+<?php endif; ?>
 <?php else: ?>
 <?php
 	if ($this->eid == 700):

From 97a6e9f02a835ee27d884119d33bde06290b902e Mon Sep 17 00:00:00 2001
From: Thomas Hunziker <werbemails@bakual.ch>
Date: Tue, 6 Dec 2016 23:32:22 +0100
Subject: [PATCH 36/39] Fix register to read redirect (#13089)

---
 components/com_users/models/login.php                   | 6 ------
 components/com_users/views/login/tmpl/default_login.php | 7 ++-----
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/components/com_users/models/login.php b/components/com_users/models/login.php
index 1c59af17902af..f541ac7249564 100644
--- a/components/com_users/models/login.php
+++ b/components/com_users/models/login.php
@@ -69,12 +69,6 @@ protected function loadFormData()
 			}
 		}
 
-		// Set the return URL if empty.
-		if (!isset($data['return']) || empty($data['return']))
-		{
-			$data['return'] = 'index.php?option=com_users&view=profile';
-		}
-
 		$app->setUserState('users.login.form.data', $data);
 
 		$this->preprocessData('com_users.login', $data);
diff --git a/components/com_users/views/login/tmpl/default_login.php b/components/com_users/views/login/tmpl/default_login.php
index 7f6c7ccda1bd8..8db36f06119b4 100644
--- a/components/com_users/views/login/tmpl/default_login.php
+++ b/components/com_users/views/login/tmpl/default_login.php
@@ -79,11 +79,8 @@
 				</div>
 			</div>
 
-			<?php if ($this->params->get('login_redirect_url')) : ?>
-				<input type="hidden" name="return" value="<?php echo base64_encode($this->params->get('login_redirect_url', $this->form->getValue('return'))); ?>" />
-			<?php else : ?>
-				<input type="hidden" name="return" value="<?php echo base64_encode($this->params->get('login_redirect_menuitem', $this->form->getValue('return'))); ?>" />
-			<?php endif; ?>
+			<?php $return = $this->form->getValue('return', '', $this->params->get('login_redirect_url', $this->params->get('login_redirect_menuitem'))); ?>
+			<input type="hidden" name="return" value="<?php echo base64_encode($return); ?>" />
 			<?php echo JHtml::_('form.token'); ?>
 		</fieldset>
 	</form>

From 1210236f39d1bd8fc35d815da941ee8dca4c8197 Mon Sep 17 00:00:00 2001
From: Tony Partridge <admin@xtech.im>
Date: Tue, 6 Dec 2016 22:33:05 +0000
Subject: [PATCH 37/39] =?UTF-8?q?Added=20new=20language=20string=20=20for?=
 =?UTF-8?q?=20Batch=20URL=20processor,=20changed=20language=20=E2=80=A6=20?=
 =?UTF-8?q?(#13090)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Added new language string  for Batch URL processor, changed language string for New URL for consistency.

* Added new language string  for Batch URL processor, changed language string for New URL for consistency.

* Fixed language string typo

* Updated Source URL to Expired URL
---
 .../com_redirect/views/links/tmpl/default_addform.php        | 2 +-
 administrator/language/en-GB/en-GB.com_redirect.ini          | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/administrator/components/com_redirect/views/links/tmpl/default_addform.php b/administrator/components/com_redirect/views/links/tmpl/default_addform.php
index f1ea6b3989942..b521d207bb9e0 100644
--- a/administrator/components/com_redirect/views/links/tmpl/default_addform.php
+++ b/administrator/components/com_redirect/views/links/tmpl/default_addform.php
@@ -14,7 +14,7 @@
 	<div class="accordion-group">
 		<div class="accordion-heading">
 			<a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion2" href="#batch">
-				<?php echo JText::_('COM_REDIRECT_FIELD_NEW_URL_LABEL');?>
+				<?php echo JText::_('COM_REDIRECT_BATCH_UPDATE_WITH_NEW_URL');?>
 			</a>
 		</div>
 		<div id="batch" class="accordion-body collapse">
diff --git a/administrator/language/en-GB/en-GB.com_redirect.ini b/administrator/language/en-GB/en-GB.com_redirect.ini
index 1436259f70b47..51b0eabb06130 100644
--- a/administrator/language/en-GB/en-GB.com_redirect.ini
+++ b/administrator/language/en-GB/en-GB.com_redirect.ini
@@ -29,9 +29,10 @@ COM_REDIRECT_FIELD_COMMENT_DESC="Sometimes it is helpful to describe the URLs fo
 COM_REDIRECT_FIELD_COMMENT_LABEL="Comment"
 COM_REDIRECT_FIELD_CREATED_DATE_LABEL="Created Date"
 COM_REDIRECT_FIELD_NEW_URL_DESC="Enter the URL to be redirected to."
-COM_REDIRECT_FIELD_NEW_URL_LABEL="Destination URL"
+COM_REDIRECT_BATCH_UPDATE_WITH_NEW_URL="Batch update new URL(s)"
+COM_REDIRECT_FIELD_NEW_URL_LABEL="New URL"
 COM_REDIRECT_FIELD_OLD_URL_DESC="Enter the URL that has to be redirected."
-COM_REDIRECT_FIELD_OLD_URL_LABEL="Source URL"
+COM_REDIRECT_FIELD_OLD_URL_LABEL="Expired URL"
 COM_REDIRECT_FIELD_REFERRER_LABEL="Link Referrer"
 COM_REDIRECT_FIELD_REDIRECT_STATUS_CODE_LABEL="Redirect Status Code"
 COM_REDIRECT_FIELD_REDIRECT_STATUS_CODE_DESC="Choose the HTTP 1.1 status code to associate with the redirect."

From b49e7cf4ec701ebd5784e35e7b45976105e31059 Mon Sep 17 00:00:00 2001
From: Brian Teeman <brian@teeman.net>
Date: Tue, 6 Dec 2016 22:41:06 +0000
Subject: [PATCH 38/39] Component options - remove ambiguity (#12987)

* Component options - remove ambiguity

* oops
---
 administrator/components/com_media/config.xml     | 4 +++-
 administrator/components/com_search/config.xml    | 5 +++--
 administrator/language/en-GB/en-GB.com_finder.ini | 4 ++--
 administrator/language/en-GB/en-GB.com_media.ini  | 1 +
 administrator/language/en-GB/en-GB.com_search.ini | 2 +-
 5 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/administrator/components/com_media/config.xml b/administrator/components/com_media/config.xml
index 06cd6ab436005..ffe071a62f513 100644
--- a/administrator/components/com_media/config.xml
+++ b/administrator/components/com_media/config.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <config>
-	<fieldset name="component">
+	<fieldset 
+		name="component"
+		label="COM_MEDIA_FIELDSET_OPTIONS_LABEL">
 		<field
 			name="upload_extensions"
 			type="text"
diff --git a/administrator/components/com_search/config.xml b/administrator/components/com_search/config.xml
index 056f405d94214..1e735fd8d4ea6 100644
--- a/administrator/components/com_search/config.xml
+++ b/administrator/components/com_search/config.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <config>
-	<fieldset name="component">
-
+	<fieldset 
+		name="component"
+		label="COM_SEARCH_FIELDSET_SEARCH_OPTIONS_LABEL">
 		<field
 			name="enabled"
 			type="radio"
diff --git a/administrator/language/en-GB/en-GB.com_finder.ini b/administrator/language/en-GB/en-GB.com_finder.ini
index 35217113c4187..0cf3b17551509 100644
--- a/administrator/language/en-GB/en-GB.com_finder.ini
+++ b/administrator/language/en-GB/en-GB.com_finder.ini
@@ -96,8 +96,8 @@ COM_FINDER_FIELD_CREATED_BY_LABEL="Created By"
 COM_FINDER_FIELD_MODIFIED_DESCRIPTION="The date and time that the filter was last modified."
 COM_FINDER_FIELDSET_INDEX_OPTIONS_DESCRIPTION="Indexing options"
 COM_FINDER_FIELDSET_INDEX_OPTIONS_LABEL="Index"
-COM_FINDER_FIELDSET_SEARCH_OPTIONS_DESCRIPTION="Search options"
-COM_FINDER_FIELDSET_SEARCH_OPTIONS_LABEL="Search"
+COM_FINDER_FIELDSET_SEARCH_OPTIONS_DESCRIPTION="Smart Search options"
+COM_FINDER_FIELDSET_SEARCH_OPTIONS_LABEL="Smart Search"
 COM_FINDER_FILTER_BRANCH_LABEL="Search by %s"
 COM_FINDER_FILTER_BY="Show %s:"
 COM_FINDER_FILTER_CONTENT_MAP_DESC="Filter the indexed content by content map."
diff --git a/administrator/language/en-GB/en-GB.com_media.ini b/administrator/language/en-GB/en-GB.com_media.ini
index f9cb7e3fca0ce..c2f4fd4f5ec4d 100644
--- a/administrator/language/en-GB/en-GB.com_media.ini
+++ b/administrator/language/en-GB/en-GB.com_media.ini
@@ -68,6 +68,7 @@ COM_MEDIA_FIELD_PATH_IMAGE_FOLDER_DESC="Enter the path to the images folder rela
 COM_MEDIA_FIELD_PATH_IMAGE_FOLDER_LABEL="Path to Images Folder"
 COM_MEDIA_FIELD_RESTRICT_UPLOADS_DESC="Restrict uploads for lower than manager users to just images if Fileinfo or MIME Magic isn't installed."
 COM_MEDIA_FIELD_RESTRICT_UPLOADS_LABEL="Restrict Uploads"
+COM_MEDIA_FIELDSET_OPTIONS_LABEL="Media"
 COM_MEDIA_FILES="Files"
 COM_MEDIA_FILESIZE="File size"
 COM_MEDIA_FOLDER="Folder"
diff --git a/administrator/language/en-GB/en-GB.com_search.ini b/administrator/language/en-GB/en-GB.com_search.ini
index e6e2fa125ed13..c5e5a4288a95d 100644
--- a/administrator/language/en-GB/en-GB.com_search.ini
+++ b/administrator/language/en-GB/en-GB.com_search.ini
@@ -24,6 +24,7 @@ COM_SEARCH_FIELD_SEARCH_PHRASES_LABEL="Use Search Options"
 COM_SEARCH_FIELD_SEARCH_AREAS_DESC="Show the search areas checkboxes."
 COM_SEARCH_FIELD_SEARCH_AREAS_LABEL="Use Search Areas"
 COM_SEARCH_FIELDSET_OPTIONAL_LABEL="Optional Search Term"
+COM_SEARCH_FIELDSET_SEARCH_OPTIONS_LABEL="Search"
 COM_SEARCH_FOR_DESC="The type of search."
 COM_SEARCH_FOR_LABEL="Search For"
 COM_SEARCH_HEADING_PHRASE="Search Phrase"
@@ -44,4 +45,3 @@ COM_SEARCH_SAVED_SEARCH_OPTIONS="Default Search Options"
 COM_SEARCH_SEARCH_IN_PHRASE="Search in phrases."
 COM_SEARCH_SHOW_SEARCH_RESULTS="Show Search Results"
 COM_SEARCH_XML_DESCRIPTION="Component for search functions."
-

From d692baf8a96d81a6d34ec9bc25fe3ca9664e2f05 Mon Sep 17 00:00:00 2001
From: marcochirienti <marco.chirienti@gmail.com>
Date: Wed, 7 Dec 2016 00:40:19 +0100
Subject: [PATCH 39/39] Update encyclopedia.php

Fixed a small typo in a comment.
contry > country
---
 templates/beez3/html/com_contact/contact/encyclopedia.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/beez3/html/com_contact/contact/encyclopedia.php b/templates/beez3/html/com_contact/contact/encyclopedia.php
index b8bd05123d18c..99e388ae87afa 100644
--- a/templates/beez3/html/com_contact/contact/encyclopedia.php
+++ b/templates/beez3/html/com_contact/contact/encyclopedia.php
@@ -59,7 +59,7 @@
 		<?php if ($this->contact->state && $this->params->get('show_state')) : ?>
 			<p class="contact-state"><?php echo $this->contact->state; ?></p>
 		<?php endif; ?>
-		<?php // Let's use contry to list the main countries it grows in. '?>
+		<?php // Let's use country to list the main countries it grows in. ?>
 		<?php if ($this->contact->country && $this->params->get('show_country')) : ?>
 			<p class="contact-country"><?php echo $this->contact->country; ?></p>
 		<?php endif; ?>