From 32aa2056a139a81eec0a8bd997437168c4fd9649 Mon Sep 17 00:00:00 2001
From: Nicola Galgano <extensions4joomla@gmail.com>
Date: Wed, 15 Jul 2015 09:26:43 +0200
Subject: [PATCH 001/176] mod_article_news - remove columns specified multiple
 times

#### Steps to reproduce the issue
install test data and click on left menu item News Flash

#### Expected result
the module works as expected

#### Actual result
DB error on MSSQL ```The column 'fulltext' was specified multiple times```

#### System information
MSSQL 2008 R2 10.50.4033
Apache  2.4.7
PHP 5.5.9
Joomla! 3.4.4-dev

#### Additional comments
the helper duplicate already  selected fileds
---
 modules/mod_articles_news/helper.php | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/modules/mod_articles_news/helper.php b/modules/mod_articles_news/helper.php
index 3d1ad52c80b56..41a2422c97d1e 100644
--- a/modules/mod_articles_news/helper.php
+++ b/modules/mod_articles_news/helper.php
@@ -46,13 +46,8 @@ public static function getList(&$params)
 		// Set the filters based on the module params
 		$model->setState('list.start', 0);
 		$model->setState('list.limit', (int) $params->get('count', 5));
-
 		$model->setState('filter.published', 1);
 
-		$model->setState('list.select', 'a.fulltext, a.id, a.title, a.alias, a.introtext, a.state, a.catid, a.created, a.created_by, a.created_by_alias,' .
-			' a.modified, a.modified_by, a.publish_up, a.publish_down, a.images, a.urls, a.attribs, a.metadata, a.metakey, a.metadesc, a.access,' .
-			' a.hits, a.featured, a.language');
-
 		// Access filter
 		$access     = !JComponentHelper::getParams('com_content')->get('show_noauth');
 		$authorised = JAccess::getAuthorisedViewLevels(JFactory::getUser()->get('id'));

From f4e6e2a1f158f26b41ad9c428ab2f8874e048eda Mon Sep 17 00:00:00 2001
From: wilsonge <georgejameswilson@googlemail.com>
Date: Wed, 8 Jul 2015 12:38:32 +0100
Subject: [PATCH 002/176] Add create table syntax for mysqli database importer

---
 libraries/joomla/database/importer/mysqli.php | 43 +++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/libraries/joomla/database/importer/mysqli.php b/libraries/joomla/database/importer/mysqli.php
index f51614d2f54ec..94cb072d5dc66 100644
--- a/libraries/joomla/database/importer/mysqli.php
+++ b/libraries/joomla/database/importer/mysqli.php
@@ -41,6 +41,49 @@ public function check()
 		return $this;
 	}
 
+	/**
+	 * Get the SQL syntax to add a table.
+	 *
+	 * @param   SimpleXMLElement  $table  The table information.
+	 *
+	 * @return  string
+	 *
+	 * @since   11.1
+	 * @throws  RuntimeException
+	 */
+	protected function xmlToCreate(SimpleXMLElement $table)
+	{
+		$existingTables = $this->db->getTableList();
+		$tableName = (string) $table['name'];
+
+		if (in_array($tableName, $existingTables))
+		{
+			throw new RuntimeException('The table you are trying to create already exists');
+		}
+
+		$createTableStatement = 'CREATE TABLE ' . $this->db->quoteName($tableName) . ' (';
+
+		foreach ($table->xpath('field') as $field)
+		{
+			$createTableStatement .= $this->getColumnSQL($field) . ', ';
+		}
+
+		$newLookup = $this->getKeyLookup($table->xpath('key'));
+
+		// Loop through each key in the new structure.
+		foreach ($newLookup as $key)
+		{
+			$createTableStatement .= $this->getKeySQL($key) . ', ';
+		}
+
+		// Remove the comma after the last key
+		$createTableStatement = rtrim($createTableStatement, ', ');
+
+		$createTableStatement .= ')';
+
+		return $createTableStatement;
+	}
+
 	/**
 	 * Get the SQL syntax to add a column.
 	 *

From 22c36b5e1e3e7cf9d1365dd518afee0a625da3f0 Mon Sep 17 00:00:00 2001
From: Izhar Aazmi <izharaazmi@gmail.com>
Date: Wed, 26 Aug 2015 16:01:06 +0530
Subject: [PATCH 003/176] Minimizing JArrayHelper by using
 Joomla\Utilities\ArrayHelper internally with appropriate deprecation
 warnings. All functionality of JArrayHelper is already available there, so no
 point keeping duplicate code.

---
 libraries/joomla/utilities/arrayhelper.php | 248 ++-------------------
 1 file changed, 17 insertions(+), 231 deletions(-)

diff --git a/libraries/joomla/utilities/arrayhelper.php b/libraries/joomla/utilities/arrayhelper.php
index 3b73a1253792c..a185bc0e1ce77 100644
--- a/libraries/joomla/utilities/arrayhelper.php
+++ b/libraries/joomla/utilities/arrayhelper.php
@@ -64,29 +64,7 @@ abstract class JArrayHelper
 	 */
 	public static function toInteger(&$array, $default = null)
 	{
-		if (is_array($array))
-		{
-			foreach ($array as $i => $v)
-			{
-				$array[$i] = (int) $v;
-			}
-		}
-		else
-		{
-			if ($default === null)
-			{
-				$array = array();
-			}
-			elseif (is_array($default))
-			{
-				self::toInteger($default, null);
-				$array = $default;
-			}
-			else
-			{
-				$array = array((int) $default);
-			}
-		}
+		$array = ArrayHelper::toInteger($array, $default);
 	}
 
 	/**
@@ -111,7 +89,7 @@ public static function toObject(&$array, $class = 'stdClass', $recursive = true)
 		}
 		else
 		{
-			JLog::add('This method is typehinted to be an array in \Joomla\Utilities\ArrayHelper::toObject.', JLog::WARNING, 'deprecated');
+			JLog::add('This method is typehinted to be an array in \Joomla\Utilities\ArrayHelper::' . __FUNCTION__ . '.', JLog::WARNING, 'deprecated');
 		}
 
 		return $obj;
@@ -140,7 +118,7 @@ public static function toString($array = null, $inner_glue = '=', $outer_glue =
 		}
 		else
 		{
-			JLog::add('This method is typehinted to be an array in \Joomla\Utilities\ArrayHelper::toString.', JLog::WARNING, 'deprecated');
+			JLog::add('This method is typehinted to be an array in \Joomla\Utilities\ArrayHelper::' . __FUNCTION__ . '.', JLog::WARNING, 'deprecated');
 		}
 
 		return implode($outer_glue, $output);
@@ -160,63 +138,7 @@ public static function toString($array = null, $inner_glue = '=', $outer_glue =
 	 */
 	public static function fromObject($p_obj, $recurse = true, $regex = null)
 	{
-		if (is_object($p_obj))
-		{
-			return self::_fromObject($p_obj, $recurse, $regex);
-		}
-		else
-		{
-			return null;
-		}
-	}
-
-	/**
-	 * Utility function to map an object or array to an array
-	 *
-	 * @param   mixed    $item     The source object or array
-	 * @param   boolean  $recurse  True to recurse through multi-level objects
-	 * @param   string   $regex    An optional regular expression to match on field names
-	 *
-	 * @return  array  The array mapped from the given object
-	 *
-	 * @since   11.1
-	 */
-	protected static function _fromObject($item, $recurse, $regex)
-	{
-		if (is_object($item))
-		{
-			$result = array();
-
-			foreach (get_object_vars($item) as $k => $v)
-			{
-				if (!$regex || preg_match($regex, $k))
-				{
-					if ($recurse)
-					{
-						$result[$k] = self::_fromObject($v, $recurse, $regex);
-					}
-					else
-					{
-						$result[$k] = $v;
-					}
-				}
-			}
-		}
-		elseif (is_array($item))
-		{
-			$result = array();
-
-			foreach ($item as $k => $v)
-			{
-				$result[$k] = self::_fromObject($v, $recurse, $regex);
-			}
-		}
-		else
-		{
-			$result = $item;
-		}
-
-		return $result;
+		ArrayHelper::fromObject($p_obj, $recurse, $regex);
 	}
 
 	/**
@@ -240,7 +162,7 @@ public static function getColumn(&$array, $index)
 		}
 		else
 		{
-			JLog::add('This method is typehinted to be an array in \Joomla\Utilities\ArrayHelper::getColumn.', JLog::WARNING, 'deprecated');
+			JLog::add('This method is typehinted to be an array in \Joomla\Utilities\ArrayHelper::' . __FUNCTION__ . '.', JLog::WARNING, 'deprecated');
 		}
 
 		return $result;
@@ -327,64 +249,15 @@ public static function isAssociative($array)
 	public static function pivot($source, $key = null)
 	{
 		$result = array();
-		$counter = array();
 
-		foreach ($source as $index => $value)
+		if (is_array($source))
 		{
-			// Determine the name of the pivot key, and its value.
-			if (is_array($value))
-			{
-				// If the key does not exist, ignore it.
-				if (!isset($value[$key]))
-				{
-					continue;
-				}
-
-				$resultKey = $value[$key];
-				$resultValue = &$source[$index];
-			}
-			elseif (is_object($value))
-			{
-				// If the key does not exist, ignore it.
-				if (!isset($value->$key))
-				{
-					continue;
-				}
-
-				$resultKey = $value->$key;
-				$resultValue = &$source[$index];
-			}
-			else
-			{
-				// Just a scalar value.
-				$resultKey = $value;
-				$resultValue = $index;
-			}
-
-			// The counter tracks how many times a key has been used.
-			if (empty($counter[$resultKey]))
-			{
-				// The first time around we just assign the value to the key.
-				$result[$resultKey] = $resultValue;
-				$counter[$resultKey] = 1;
-			}
-			elseif ($counter[$resultKey] == 1)
-			{
-				// If there is a second time, we convert the value into an array.
-				$result[$resultKey] = array(
-					$result[$resultKey],
-					$resultValue,
-				);
-				$counter[$resultKey]++;
-			}
-			else
-			{
-				// After the second time, no need to track any more. Just append to the existing array.
-				$result[$resultKey][] = $resultValue;
-			}
+			$result = ArrayHelper::pivot($source, $key);
+		}
+		else
+		{
+			JLog::add('This method is typehinted to be an array in \Joomla\Utilities\ArrayHelper::' . __FUNCTION__ . '.', JLog::WARNING, 'deprecated');
 		}
-
-		unset($counter);
 
 		return $result;
 	}
@@ -405,86 +278,16 @@ public static function pivot($source, $key = null)
 	 */
 	public static function sortObjects(&$a, $k, $direction = 1, $caseSensitive = true, $locale = false)
 	{
-		if (!is_array($locale) || !is_array($locale[0]))
+		if (is_array($a))
 		{
-			$locale = array($locale);
+			$a = ArrayHelper::sortObjects($a, $k, $direction, $caseSensitive, $locale);
 		}
-
-		self::$sortCase = (array) $caseSensitive;
-		self::$sortDirection = (array) $direction;
-		self::$sortKey = (array) $k;
-		self::$sortLocale = $locale;
-
-		usort($a, array(__CLASS__, '_sortObjects'));
-
-		self::$sortCase = null;
-		self::$sortDirection = null;
-		self::$sortKey = null;
-		self::$sortLocale = null;
-
-		return $a;
-	}
-
-	/**
-	 * Callback function for sorting an array of objects on a key
-	 *
-	 * @param   array  &$a  An array of objects
-	 * @param   array  &$b  An array of objects
-	 *
-	 * @return  integer  Comparison status
-	 *
-	 * @see     JArrayHelper::sortObjects()
-	 * @since   11.1
-	 */
-	protected static function _sortObjects(&$a, &$b)
-	{
-		$key = self::$sortKey;
-
-		for ($i = 0, $count = count($key); $i < $count; $i++)
+		else
 		{
-			if (isset(self::$sortDirection[$i]))
-			{
-				$direction = self::$sortDirection[$i];
-			}
-
-			if (isset(self::$sortCase[$i]))
-			{
-				$caseSensitive = self::$sortCase[$i];
-			}
-
-			if (isset(self::$sortLocale[$i]))
-			{
-				$locale = self::$sortLocale[$i];
-			}
-
-			$va = $a->{$key[$i]};
-			$vb = $b->{$key[$i]};
-
-			if ((is_bool($va) || is_numeric($va)) && (is_bool($vb) || is_numeric($vb)))
-			{
-				$cmp = $va - $vb;
-			}
-			elseif ($caseSensitive)
-			{
-				$cmp = JString::strcmp($va, $vb, $locale);
-			}
-			else
-			{
-				$cmp = JString::strcasecmp($va, $vb, $locale);
-			}
-
-			if ($cmp > 0)
-			{
-				return $direction;
-			}
-
-			if ($cmp < 0)
-			{
-				return -$direction;
-			}
+			JLog::add('This method is typehinted to be an array in \Joomla\Utilities\ArrayHelper::' . __FUNCTION__ . '.', JLog::WARNING, 'deprecated');
 		}
 
-		return 0;
+		return $a;
 	}
 
 	/**
@@ -500,23 +303,6 @@ protected static function _sortObjects(&$a, &$b)
 	 */
 	public static function arrayUnique($myArray)
 	{
-		if (!is_array($myArray))
-		{
-			return $myArray;
-		}
-
-		foreach ($myArray as &$myvalue)
-		{
-			$myvalue = serialize($myvalue);
-		}
-
-		$myArray = array_unique($myArray);
-
-		foreach ($myArray as &$myvalue)
-		{
-			$myvalue = unserialize($myvalue);
-		}
-
-		return $myArray;
+		return is_array($myArray) ? ArrayHelper::arrayUnique($myArray) : $myArray;
 	}
 }

From 7f9ff9d3bc875d79ceee1e0cf5172a6c920540ed Mon Sep 17 00:00:00 2001
From: Izhar Aazmi <izharaazmi@gmail.com>
Date: Sat, 5 Sep 2015 14:15:24 +0530
Subject: [PATCH 004/176] Missing return statement

Added the missing return statement that caused fromObject method to fail.
---
 libraries/joomla/utilities/arrayhelper.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/joomla/utilities/arrayhelper.php b/libraries/joomla/utilities/arrayhelper.php
index a185bc0e1ce77..c0d2f21c436d6 100644
--- a/libraries/joomla/utilities/arrayhelper.php
+++ b/libraries/joomla/utilities/arrayhelper.php
@@ -138,7 +138,7 @@ public static function toString($array = null, $inner_glue = '=', $outer_glue =
 	 */
 	public static function fromObject($p_obj, $recurse = true, $regex = null)
 	{
-		ArrayHelper::fromObject($p_obj, $recurse, $regex);
+		return ArrayHelper::fromObject($p_obj, $recurse, $regex);
 	}
 
 	/**

From ad48dac00d634fdafa82fa883c3cd5123c4a1cc6 Mon Sep 17 00:00:00 2001
From: Izhar Aazmi <izharaazmi@gmail.com>
Date: Sat, 3 Oct 2015 14:26:16 +0530
Subject: [PATCH 005/176] Change magic constant __FUNCTION__ to fixed method
 name strings.

---
 libraries/joomla/utilities/arrayhelper.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/libraries/joomla/utilities/arrayhelper.php b/libraries/joomla/utilities/arrayhelper.php
index c0d2f21c436d6..01e54b6bc1535 100644
--- a/libraries/joomla/utilities/arrayhelper.php
+++ b/libraries/joomla/utilities/arrayhelper.php
@@ -89,7 +89,7 @@ public static function toObject(&$array, $class = 'stdClass', $recursive = true)
 		}
 		else
 		{
-			JLog::add('This method is typehinted to be an array in \Joomla\Utilities\ArrayHelper::' . __FUNCTION__ . '.', JLog::WARNING, 'deprecated');
+			JLog::add('This method is typehinted to be an array in \Joomla\Utilities\ArrayHelper::toObject.', JLog::WARNING, 'deprecated');
 		}
 
 		return $obj;
@@ -118,7 +118,7 @@ public static function toString($array = null, $inner_glue = '=', $outer_glue =
 		}
 		else
 		{
-			JLog::add('This method is typehinted to be an array in \Joomla\Utilities\ArrayHelper::' . __FUNCTION__ . '.', JLog::WARNING, 'deprecated');
+			JLog::add('This method is typehinted to be an array in \Joomla\Utilities\ArrayHelper::toString.', JLog::WARNING, 'deprecated');
 		}
 
 		return implode($outer_glue, $output);
@@ -162,7 +162,7 @@ public static function getColumn(&$array, $index)
 		}
 		else
 		{
-			JLog::add('This method is typehinted to be an array in \Joomla\Utilities\ArrayHelper::' . __FUNCTION__ . '.', JLog::WARNING, 'deprecated');
+			JLog::add('This method is typehinted to be an array in \Joomla\Utilities\ArrayHelper::getColumn.', JLog::WARNING, 'deprecated');
 		}
 
 		return $result;
@@ -256,7 +256,7 @@ public static function pivot($source, $key = null)
 		}
 		else
 		{
-			JLog::add('This method is typehinted to be an array in \Joomla\Utilities\ArrayHelper::' . __FUNCTION__ . '.', JLog::WARNING, 'deprecated');
+			JLog::add('This method is typehinted to be an array in \Joomla\Utilities\ArrayHelper::pivot.', JLog::WARNING, 'deprecated');
 		}
 
 		return $result;
@@ -284,7 +284,7 @@ public static function sortObjects(&$a, $k, $direction = 1, $caseSensitive = tru
 		}
 		else
 		{
-			JLog::add('This method is typehinted to be an array in \Joomla\Utilities\ArrayHelper::' . __FUNCTION__ . '.', JLog::WARNING, 'deprecated');
+			JLog::add('This method is typehinted to be an array in \Joomla\Utilities\ArrayHelper::sortObjects.', JLog::WARNING, 'deprecated');
 		}
 
 		return $a;

From 8d5f65aaf2e0c0c635262a5686bd362dde18a479 Mon Sep 17 00:00:00 2001
From: "Ing. Stefan Polzer" <develop@posit.at>
Date: Sun, 25 Oct 2015 01:08:37 +0200
Subject: [PATCH 006/176] add autocomplete=email to form filds

---
 components/com_contact/models/forms/contact.xml    | 1 +
 components/com_contact/models/forms/form.xml       | 2 +-
 components/com_users/models/forms/profile.xml      | 1 +
 components/com_users/models/forms/registration.xml | 1 +
 components/com_users/models/forms/remind.xml       | 1 +
 5 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/components/com_contact/models/forms/contact.xml b/components/com_contact/models/forms/contact.xml
index 59902f82cd681..1500d002a6ab1 100644
--- a/components/com_contact/models/forms/contact.xml
+++ b/components/com_contact/models/forms/contact.xml
@@ -19,6 +19,7 @@
 			filter="string"
 			validate="contactemail"
 			required="true"
+			autocomplete="email"
 		/>
 		<field name="contact_subject"
 			type="text"
diff --git a/components/com_contact/models/forms/form.xml b/components/com_contact/models/forms/form.xml
index 91eab7aaccc88..e271905182e86 100644
--- a/components/com_contact/models/forms/form.xml
+++ b/components/com_contact/models/forms/form.xml
@@ -87,7 +87,7 @@
 		<field name="email_to" type="email"
 			description="CONTACT_INFORMATION_EMAIL_DESC"
 			label="CONTACT_INFORMATION_EMAIL_LABEL"
-			size="30" validate="email" filter="string"
+			size="30" validate="email" filter="string" autocomplete="email"
 		/>
 
 		<field name="address" type="textarea"
diff --git a/components/com_users/models/forms/profile.xml b/components/com_users/models/forms/profile.xml
index f02eccac6a4a4..b733e036fe06f 100644
--- a/components/com_users/models/forms/profile.xml
+++ b/components/com_users/models/forms/profile.xml
@@ -67,6 +67,7 @@
 			size="30"
 			unique="true"
 			validate="email"
+			autocomplete="email"
 		/>
 
 		<field
diff --git a/components/com_users/models/forms/registration.xml b/components/com_users/models/forms/registration.xml
index 26bbb2d58fab6..c3b3009976a67 100644
--- a/components/com_users/models/forms/registration.xml
+++ b/components/com_users/models/forms/registration.xml
@@ -72,6 +72,7 @@
 			size="30"
 			unique="true"
 			validate="email"
+			autocomplete="email"
 		/>
 
 		<field
diff --git a/components/com_users/models/forms/remind.xml b/components/com_users/models/forms/remind.xml
index 4bfc4a45851d0..f86f2787289c1 100644
--- a/components/com_users/models/forms/remind.xml
+++ b/components/com_users/models/forms/remind.xml
@@ -9,6 +9,7 @@
 			required="true"
 			size="30"
 			validate="email"
+			autocomplete="email"
 		/>
 		
 		<field

From 9caa49caa64a7de4a05461d5b0e09815dcb17973 Mon Sep 17 00:00:00 2001
From: laoneo <allon.moritz@digital-peak.com>
Date: Mon, 26 Oct 2015 20:36:39 +0100
Subject: [PATCH 007/176] Support for input elements in the searchoolbar

---
 media/jui/js/jquery.searchtools.js     | 2 +-
 media/jui/js/jquery.searchtools.min.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media/jui/js/jquery.searchtools.js b/media/jui/js/jquery.searchtools.js
index a55e387581d57..666f358e0a3bb 100644
--- a/media/jui/js/jquery.searchtools.js
+++ b/media/jui/js/jquery.searchtools.js
@@ -232,7 +232,7 @@
 			$(chosenId).removeClass('active');
 		},
 		getFilterFields: function () {
-			return this.filterContainer.find('select');
+			return this.filterContainer.find('select,input');
 		},
 		getListFields: function () {
 			return this.listContainer.find('select');
diff --git a/media/jui/js/jquery.searchtools.min.js b/media/jui/js/jquery.searchtools.min.js
index d48c18be262b0..1cc002054105a 100644
--- a/media/jui/js/jquery.searchtools.min.js
+++ b/media/jui/js/jquery.searchtools.min.js
@@ -1 +1 @@
-(function($,window,document,undefined){var pluginName="searchtools";var defaults={formSelector:".js-stools-form",searchFieldSelector:".js-stools-field-search",clearBtnSelector:".js-stools-btn-clear",mainContainerSelector:".js-stools",searchBtnSelector:".js-stools-btn-search",filterBtnSelector:".js-stools-btn-filter",filterContainerSelector:".js-stools-container-filters",filtersHidden:true,listBtnSelector:".js-stools-btn-list",listContainerSelector:".js-stools-container-list",listHidden:false,orderColumnSelector:".js-stools-column-order",orderBtnSelector:".js-stools-btn-order",orderFieldSelector:".js-stools-field-order",orderFieldName:"list[fullordering]",limitFieldSelector:".js-stools-field-limit",defaultLimit:20,activeOrder:null,activeDirection:"ASC",chosenSupport:true,clearListOptions:false};function Plugin(element,options){this.element=element;this.options=$.extend({},defaults,options);this._defaults=defaults;this.theForm=$(this.options.formSelector);this.filterButton=$(this.options.formSelector+" "+this.options.filterBtnSelector);this.filterContainer=$(this.options.formSelector+" "+this.options.filterContainerSelector);this.filtersHidden=this.options.filtersHidden;this.listButton=$(this.options.formSelector+" "+this.options.listBtnSelector);this.listContainer=$(this.options.formSelector+" "+this.options.listContainerSelector);this.listHidden=this.options.listHidden;this.mainContainer=$(this.options.mainContainerSelector);this.searchButton=$(this.options.formSelector+" "+this.options.searchBtnSelector);this.searchField=$(this.options.formSelector+" "+this.options.searchFieldSelector);this.searchString=null;this.clearButton=$(this.options.clearBtnSelector);this.orderCols=$(this.options.formSelector+" "+this.options.orderColumnSelector);this.orderField=$(this.options.formSelector+" "+this.options.orderFieldSelector);this.limitField=$(this.options.formSelector+" "+this.options.limitFieldSelector);this.activeColumn=null;this.activeDirection=this.options.activeDirection;this.activeOrder=this.options.activeOrder;this.activeLimit=null;this.chosenSupport=this.options.chosenSupport;this.clearListOptions=this.options.clearListOptions;this._name=pluginName;this.init()}Plugin.prototype={init:function(){var self=this;if(!document.addEventListener){if(this.searchField.val()===this.searchField.attr("placeholder")){this.searchField.val("")}}this.searchString=this.searchField.val();if(this.filtersHidden){this.hideFilters()}else{this.showFilters()}if(this.listHidden){this.hideList()}else{this.showList()}self.filterButton.click(function(e){self.toggleFilters();e.stopPropagation();e.preventDefault()});self.listButton.click(function(e){self.toggleList();e.stopPropagation();e.preventDefault()});self.getFilterFields().each(function(i,element){self.checkFilter(element);$(element).change(function(){self.checkFilter(element)})});self.clearButton.click(function(e){self.clear()});this.createOrderField();this.orderCols.click(function(){var newOrderCol=$(this).attr("data-order");var newDirection=$(this).attr('data-direction');var newOrdering=newOrderCol+" "+newDirection;if(newOrderCol.length){self.activeColumn=newOrderCol;if(newOrdering!==self.activeOrder){self.activeDirection=newDirection;self.activeOrder=newOrdering;self.updateFieldValue(self.orderField,newOrdering)}else{self.toggleDirection()}self.theForm.submit()}})},checkFilter:function(element){var self=this;var option=$(element).find("option:selected");if(option.val()!==""){self.activeFilter(element)}else{self.deactiveFilter(element)}},clear:function(){var self=this;self.getFilterFields().each(function(i,element){$(element).val("");self.checkFilter(element);if(self.chosenSupport){$(element).trigger("liszt:updated")}});if(self.clearListOptions){self.getListFields().each(function(i,element){$(element).val("");self.checkFilter(element);if(self.chosenSupport){$(element).trigger("liszt:updated")}});$("#list_limit").val(self.options.defaultLimit);if(self.chosenSupport){$("#list_limit").trigger("liszt:updated")}}self.searchField.val("");self.theForm.submit()},activeFilter:function(element){var self=this;$(element).addClass("active");var chosenId="#"+$(element).attr("id")+"_chzn";$(chosenId).addClass("active")},deactiveFilter:function(element){var self=this;$(element).removeClass("active");var chosenId="#"+$(element).attr("id")+"_chzn";$(chosenId).removeClass("active")},getFilterFields:function(){return this.filterContainer.find("select")},getListFields:function(){return this.listContainer.find("select")},hideContainer:function(container){$(container).hide("fast");$(container).removeClass("shown")},showContainer:function(container){$(container).show("fast");$(container).addClass("shown")},toggleContainer:function(container){if($(container).hasClass("shown")){this.hideContainer(container)}else{this.showContainer(container)}},hideList:function(){this.hideContainer(this.listContainer);this.listButton.removeClass("btn-primary")},showList:function(){this.showContainer(this.listContainer);this.listButton.addClass("btn-primary")},toggleList:function(){this.toggleContainer(this.listContainer);if(this.listContainer.hasClass("shown")){this.listButton.addClass("btn-primary")}else{this.listButton.removeClass("btn-primary")}},hideFilters:function(){this.hideContainer(this.filterContainer);this.filterButton.removeClass("btn-primary")},showFilters:function(){this.showContainer(this.filterContainer);this.filterButton.addClass("btn-primary")},toggleFilters:function(){this.toggleContainer(this.filterContainer);if(this.filterContainer.hasClass("shown")){this.filterButton.addClass("btn-primary")}else{this.filterButton.removeClass("btn-primary")}},toggleDirection:function(){var self=this;var newDirection="ASC";if(self.activeDirection.toUpperCase()=="ASC"){newDirection="DESC"}self.activeDirection=newDirection;self.activeOrder=self.activeColumn+" "+newDirection;self.updateFieldValue(self.orderField,self.activeOrder)},createOrderField:function(){var self=this;if(!this.orderField.length){this.orderField=$("<input>").attr({type:"hidden",id:"js-stools-field-order","class":"js-stools-field-order",name:self.options.orderFieldName,value:self.activeOrder+" "+this.activeDirection});this.orderField.appendTo(this.theForm)}if(this.orderField.is("select")){this.orderCols.each(function(){var value=$(this).attr("data-order");var name=$(this).attr("data-name");var direction=$(this).attr("data-direction");if(value.length){value=value+" "+direction;var option=self.findOption(self.orderField,value);if(!option.length){var option=$("<option>");option.text(name).val(value);if($(this).hasClass("active")){option.attr("selected","selected")}self.orderField.append(option)}}});this.orderField.trigger("liszt:updated")}this.activeOrder=this.orderField.val()},updateFieldValue:function(field,newValue){var self=this;var type=field.attr("type");if(type==="hidden"||type==="text"){field.attr("value",newValue)}else if(field.is("select")){var desiredOption=field.find("option").filter(function(){return $(this).val()==newValue});if(desiredOption.length){desiredOption.attr("selected","selected")}else{var option=$("<option>");option.text(newValue).val(newValue);option.attr("selected","selected");field.append(option)}if(self.chosenSupport){field.trigger("liszt:updated")}}},findOption:function(select,value){return select.find("option").filter(function(){return $(this).val()==value})}};$.fn[pluginName]=function(options){return this.each(function(){if(!$.data(this,"plugin_"+pluginName)){$.data(this,"plugin_"+pluginName,new Plugin(this,options))}})}})(jQuery,window,document);
\ No newline at end of file
+(function($,window,document,undefined){var pluginName="searchtools";var defaults={formSelector:".js-stools-form",searchFieldSelector:".js-stools-field-search",clearBtnSelector:".js-stools-btn-clear",mainContainerSelector:".js-stools",searchBtnSelector:".js-stools-btn-search",filterBtnSelector:".js-stools-btn-filter",filterContainerSelector:".js-stools-container-filters",filtersHidden:true,listBtnSelector:".js-stools-btn-list",listContainerSelector:".js-stools-container-list",listHidden:false,orderColumnSelector:".js-stools-column-order",orderBtnSelector:".js-stools-btn-order",orderFieldSelector:".js-stools-field-order",orderFieldName:"list[fullordering]",limitFieldSelector:".js-stools-field-limit",defaultLimit:20,activeOrder:null,activeDirection:"ASC",chosenSupport:true,clearListOptions:false};function Plugin(element,options){this.element=element;this.options=$.extend({},defaults,options);this._defaults=defaults;this.theForm=$(this.options.formSelector);this.filterButton=$(this.options.formSelector+" "+this.options.filterBtnSelector);this.filterContainer=$(this.options.formSelector+" "+this.options.filterContainerSelector);this.filtersHidden=this.options.filtersHidden;this.listButton=$(this.options.formSelector+" "+this.options.listBtnSelector);this.listContainer=$(this.options.formSelector+" "+this.options.listContainerSelector);this.listHidden=this.options.listHidden;this.mainContainer=$(this.options.mainContainerSelector);this.searchButton=$(this.options.formSelector+" "+this.options.searchBtnSelector);this.searchField=$(this.options.formSelector+" "+this.options.searchFieldSelector);this.searchString=null;this.clearButton=$(this.options.clearBtnSelector);this.orderCols=$(this.options.formSelector+" "+this.options.orderColumnSelector);this.orderField=$(this.options.formSelector+" "+this.options.orderFieldSelector);this.limitField=$(this.options.formSelector+" "+this.options.limitFieldSelector);this.activeColumn=null;this.activeDirection=this.options.activeDirection;this.activeOrder=this.options.activeOrder;this.activeLimit=null;this.chosenSupport=this.options.chosenSupport;this.clearListOptions=this.options.clearListOptions;this._name=pluginName;this.init()}Plugin.prototype={init:function(){var self=this;if(!document.addEventListener){if(this.searchField.val()===this.searchField.attr("placeholder")){this.searchField.val("")}}this.searchString=this.searchField.val();if(this.filtersHidden){this.hideFilters()}else{this.showFilters()}if(this.listHidden){this.hideList()}else{this.showList()}self.filterButton.click(function(e){self.toggleFilters();e.stopPropagation();e.preventDefault()});self.listButton.click(function(e){self.toggleList();e.stopPropagation();e.preventDefault()});self.getFilterFields().each(function(i,element){self.checkFilter(element);$(element).change(function(){self.checkFilter(element)})});self.clearButton.click(function(e){self.clear()});this.createOrderField();this.orderCols.click(function(){var newOrderCol=$(this).attr("data-order");var newDirection=$(this).attr('data-direction');var newOrdering=newOrderCol+" "+newDirection;if(newOrderCol.length){self.activeColumn=newOrderCol;if(newOrdering!==self.activeOrder){self.activeDirection=newDirection;self.activeOrder=newOrdering;self.updateFieldValue(self.orderField,newOrdering)}else{self.toggleDirection()}self.theForm.submit()}})},checkFilter:function(element){var self=this;var option=$(element).find("option:selected");if(option.val()!==""){self.activeFilter(element)}else{self.deactiveFilter(element)}},clear:function(){var self=this;self.getFilterFields().each(function(i,element){$(element).val("");self.checkFilter(element);if(self.chosenSupport){$(element).trigger("liszt:updated")}});if(self.clearListOptions){self.getListFields().each(function(i,element){$(element).val("");self.checkFilter(element);if(self.chosenSupport){$(element).trigger("liszt:updated")}});$("#list_limit").val(self.options.defaultLimit);if(self.chosenSupport){$("#list_limit").trigger("liszt:updated")}}self.searchField.val("");self.theForm.submit()},activeFilter:function(element){var self=this;$(element).addClass("active");var chosenId="#"+$(element).attr("id")+"_chzn";$(chosenId).addClass("active")},deactiveFilter:function(element){var self=this;$(element).removeClass("active");var chosenId="#"+$(element).attr("id")+"_chzn";$(chosenId).removeClass("active")},getFilterFields:function(){return this.filterContainer.find("select,input")},getListFields:function(){return this.listContainer.find("select")},hideContainer:function(container){$(container).hide("fast");$(container).removeClass("shown")},showContainer:function(container){$(container).show("fast");$(container).addClass("shown")},toggleContainer:function(container){if($(container).hasClass("shown")){this.hideContainer(container)}else{this.showContainer(container)}},hideList:function(){this.hideContainer(this.listContainer);this.listButton.removeClass("btn-primary")},showList:function(){this.showContainer(this.listContainer);this.listButton.addClass("btn-primary")},toggleList:function(){this.toggleContainer(this.listContainer);if(this.listContainer.hasClass("shown")){this.listButton.addClass("btn-primary")}else{this.listButton.removeClass("btn-primary")}},hideFilters:function(){this.hideContainer(this.filterContainer);this.filterButton.removeClass("btn-primary")},showFilters:function(){this.showContainer(this.filterContainer);this.filterButton.addClass("btn-primary")},toggleFilters:function(){this.toggleContainer(this.filterContainer);if(this.filterContainer.hasClass("shown")){this.filterButton.addClass("btn-primary")}else{this.filterButton.removeClass("btn-primary")}},toggleDirection:function(){var self=this;var newDirection="ASC";if(self.activeDirection.toUpperCase()=="ASC"){newDirection="DESC"}self.activeDirection=newDirection;self.activeOrder=self.activeColumn+" "+newDirection;self.updateFieldValue(self.orderField,self.activeOrder)},createOrderField:function(){var self=this;if(!this.orderField.length){this.orderField=$("<input>").attr({type:"hidden",id:"js-stools-field-order","class":"js-stools-field-order",name:self.options.orderFieldName,value:self.activeOrder+" "+this.activeDirection});this.orderField.appendTo(this.theForm)}if(this.orderField.is("select")){this.orderCols.each(function(){var value=$(this).attr("data-order");var name=$(this).attr("data-name");var direction=$(this).attr("data-direction");if(value.length){value=value+" "+direction;var option=self.findOption(self.orderField,value);if(!option.length){var option=$("<option>");option.text(name).val(value);if($(this).hasClass("active")){option.attr("selected","selected")}self.orderField.append(option)}}});this.orderField.trigger("liszt:updated")}this.activeOrder=this.orderField.val()},updateFieldValue:function(field,newValue){var self=this;var type=field.attr("type");if(type==="hidden"||type==="text"){field.attr("value",newValue)}else if(field.is("select")){var desiredOption=field.find("option").filter(function(){return $(this).val()==newValue});if(desiredOption.length){desiredOption.attr("selected","selected")}else{var option=$("<option>");option.text(newValue).val(newValue);option.attr("selected","selected");field.append(option)}if(self.chosenSupport){field.trigger("liszt:updated")}}},findOption:function(select,value){return select.find("option").filter(function(){return $(this).val()==value})}};$.fn[pluginName]=function(options){return this.each(function(){if(!$.data(this,"plugin_"+pluginName)){$.data(this,"plugin_"+pluginName,new Plugin(this,options))}})}})(jQuery,window,document);
\ No newline at end of file

From 88bbca6a28bdf5c1370c8193a5beb3508d335205 Mon Sep 17 00:00:00 2001
From: pe7er <github@pe7er.com>
Date: Sat, 7 Nov 2015 11:39:46 +0100
Subject: [PATCH 008/176] filter nullbyte

---
 libraries/joomla/application/web.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libraries/joomla/application/web.php b/libraries/joomla/application/web.php
index 735adac02fed7..56473c84d6fae 100644
--- a/libraries/joomla/application/web.php
+++ b/libraries/joomla/application/web.php
@@ -957,6 +957,7 @@ public function flushAssets()
 	 */
 	protected function header($string, $replace = true, $code = null)
 	{
+		$string = str_replace(chr(0), '', $string);
 		header($string, $replace, $code);
 	}
 

From 4ecd8ca720e9934bf53903855b5fed4780562c2f Mon Sep 17 00:00:00 2001
From: mttronc <mttronc@users.noreply.github.com>
Date: Sat, 7 Nov 2015 20:40:44 +0100
Subject: [PATCH 009/176] fix undefined variable $showPreview in Isis

---
 .../templates/isis/html/layouts/joomla/form/field/media.php      | 1 -
 1 file changed, 1 deletion(-)

diff --git a/administrator/templates/isis/html/layouts/joomla/form/field/media.php b/administrator/templates/isis/html/layouts/joomla/form/field/media.php
index 94d70212c846a..9b979a915cde0 100644
--- a/administrator/templates/isis/html/layouts/joomla/form/field/media.php
+++ b/administrator/templates/isis/html/layouts/joomla/form/field/media.php
@@ -59,7 +59,6 @@
 	case 'yes': // Deprecated parameter value
 	case 'true':
 	case 'show':
-		break;
 	case 'tooltip':
 	default:
 		$showPreview = true;

From 58efabfb8be0d64b4e5f832cf06a65561d22dc6f Mon Sep 17 00:00:00 2001
From: mttronc <mttronc@users.noreply.github.com>
Date: Sun, 8 Nov 2015 01:00:20 +0100
Subject: [PATCH 010/176] fix undefined variable $showPreview in protostar

---
 templates/protostar/html/layouts/joomla/form/field/media.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/templates/protostar/html/layouts/joomla/form/field/media.php b/templates/protostar/html/layouts/joomla/form/field/media.php
index 9b74b8b05264d..6c0d14b931f7c 100644
--- a/templates/protostar/html/layouts/joomla/form/field/media.php
+++ b/templates/protostar/html/layouts/joomla/form/field/media.php
@@ -59,7 +59,6 @@
 	case 'yes': // Deprecated parameter value
 	case 'true':
 	case 'show':
-		break;
 	case 'tooltip':
 	default:
 		$showPreview = true;

From b51d8132cee18fccdfcf2681f34af5c1b840ca85 Mon Sep 17 00:00:00 2001
From: pe7er <github@pe7er.com>
Date: Sun, 8 Nov 2015 16:49:11 +0100
Subject: [PATCH 011/176] fixed wordwrap long (user)name com_users

---
 .../components/com_users/views/users/tmpl/default.php       | 6 +++---
 .../templates/hathor/html/com_users/users/default.php       | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/administrator/components/com_users/views/users/tmpl/default.php b/administrator/components/com_users/views/users/tmpl/default.php
index 13c2e3a0560a4..f2d6e8aa625a6 100644
--- a/administrator/components/com_users/views/users/tmpl/default.php
+++ b/administrator/components/com_users/views/users/tmpl/default.php
@@ -96,7 +96,7 @@
 							<?php endif; ?>
 						</td>
 						<td>
-							<div class="name">
+							<div class="name break-word">
 							<?php if ($canEdit) : ?>
 								<a href="<?php echo JRoute::_('index.php?option=com_users&task=user.edit&id=' . (int) $item->id); ?>" title="<?php echo JText::sprintf('COM_USERS_EDIT_USER', $this->escape($item->name)); ?>">
 									<?php echo $this->escape($item->name); ?></a>
@@ -118,7 +118,7 @@
 								<?php echo JText::_('COM_USERS_DEBUG_USER');?></a></div>
 							<?php endif; ?>
 						</td>
-						<td>
+						<td class="break-word">
 							<?php echo $this->escape($item->username); ?>
 						</td>
 						<td class="center">
@@ -144,7 +144,7 @@
 								<?php echo nl2br($item->group_names); ?>
 							<?php endif; ?>
 						</td>
-						<td class="hidden-phone">
+						<td class="hidden-phone break-word">
 							<?php echo JStringPunycode::emailToUTF8($this->escape($item->email)); ?>
 						</td>
 						<td class="hidden-phone">
diff --git a/administrator/templates/hathor/html/com_users/users/default.php b/administrator/templates/hathor/html/com_users/users/default.php
index 0b34c4ee0a68a..c176be9aaaff8 100644
--- a/administrator/templates/hathor/html/com_users/users/default.php
+++ b/administrator/templates/hathor/html/com_users/users/default.php
@@ -133,7 +133,7 @@
 						<?php echo JHtml::_('grid.id', $i, $item->id); ?>
 					<?php endif; ?>
 				</td>
-				<td>
+				<td class="break-word">
 					<div class="fltrt">
 						<?php echo JHtml::_('users.filterNotes', $item->note_count, $item->id); ?>
 						<?php echo JHtml::_('users.notes', $item->note_count, $item->id); ?>
@@ -154,7 +154,7 @@
 						<?php echo JText::_('COM_USERS_DEBUG_USER');?></a></div></div></div>
 					<?php endif; ?>
 				</td>
-				<td class="center">
+				<td class="center break-word">
 					<?php echo $this->escape($item->username); ?>
 				</td>
 				<td class="center">
@@ -178,7 +178,7 @@
 						<?php echo nl2br($item->group_names); ?>
 					<?php endif; ?>
 				</td>
-				<td class="center">
+				<td class="center break-word">
 					<?php echo $this->escape($item->email); ?>
 				</td>
 				<td class="center">

From dfcad9aa9c97ee4d92e0ceb80d384de25141a256 Mon Sep 17 00:00:00 2001
From: Peter van Westen <peter@nonumber.nl>
Date: Sun, 8 Nov 2015 20:46:22 +0100
Subject: [PATCH 012/176] Changes default login background color from #224c8f
 to #17568c

---
 administrator/templates/isis/css/template.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/administrator/templates/isis/css/template.css b/administrator/templates/isis/css/template.css
index 009ed340811c3..3e989c4fbd6a1 100644
--- a/administrator/templates/isis/css/template.css
+++ b/administrator/templates/isis/css/template.css
@@ -7029,7 +7029,7 @@ a:focus {
 	outline: none;
 }
 .view-login {
-	background-color: #224c8f;
+	background-color: #17568c;
 	padding-top: 0;
 }
 .view-login .container {

From 568170dd78562431f76dcdf37edcd2b8776c4bfc Mon Sep 17 00:00:00 2001
From: Peter van Westen <peter@nonumber.nl>
Date: Sun, 8 Nov 2015 20:47:13 +0100
Subject: [PATCH 013/176] Update template-rtl.css

---
 administrator/templates/isis/css/template-rtl.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/administrator/templates/isis/css/template-rtl.css b/administrator/templates/isis/css/template-rtl.css
index 0f255654f0aef..c06d9a31ebb46 100644
--- a/administrator/templates/isis/css/template-rtl.css
+++ b/administrator/templates/isis/css/template-rtl.css
@@ -7029,7 +7029,7 @@ a:focus {
 	outline: none;
 }
 .view-login {
-	background-color: #224c8f;
+	background-color: #17568c;
 	padding-top: 0;
 }
 .view-login .container {

From 97ab51a134fcea8b8566dfa7f0237976bdfd474f Mon Sep 17 00:00:00 2001
From: Peter van Westen <peter@nonumber.nl>
Date: Sun, 8 Nov 2015 20:48:14 +0100
Subject: [PATCH 014/176] Update variables.less

---
 administrator/templates/isis/less/variables.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/administrator/templates/isis/less/variables.less b/administrator/templates/isis/less/variables.less
index 96c6656aca5fd..80eb86acc553c 100644
--- a/administrator/templates/isis/less/variables.less
+++ b/administrator/templates/isis/less/variables.less
@@ -315,7 +315,7 @@
 // > Joomla JUI
 // Login
 // -------------------------
-@loginBackground:                  #224c8f;
+@loginBackground:                  #17568c;
 
 // Header
 // -------------------------

From 68fe821de9f72ca40e3da00d08ce63b68a2fffba Mon Sep 17 00:00:00 2001
From: Peter van Westen <peter@nonumber.nl>
Date: Sun, 8 Nov 2015 20:48:55 +0100
Subject: [PATCH 015/176] Update templateDetails.xml

---
 administrator/templates/isis/templateDetails.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/administrator/templates/isis/templateDetails.xml b/administrator/templates/isis/templateDetails.xml
index a6b06d1b516d2..89c0a80cecbbc 100644
--- a/administrator/templates/isis/templateDetails.xml
+++ b/administrator/templates/isis/templateDetails.xml
@@ -67,7 +67,7 @@
 				label="TPL_ISIS_COLOR_LINK_LABEL"
 				description="TPL_ISIS_COLOR_LINK_DESC" />
 
-				<field name="loginBackgroundColor" class="" type="color" default="#224C8F"
+				<field name="loginBackgroundColor" class="" type="color" default="#17568C"
 				validate="color"
 				label="TPL_ISIS_COLOR_LOGIN_BACKGROUND_LABEL"
 				description="TPL_ISIS_COLOR_LOGIN_BACKGROUND_DESC" />

From 130761615e398d2078e7d06744934500bd624ba8 Mon Sep 17 00:00:00 2001
From: Roger Abt <abt@masterhomepage.ch>
Date: Sun, 8 Nov 2015 21:28:57 +0100
Subject: [PATCH 016/176] Fix if feeds are displayed reversed/ASC

---
 .../com_newsfeeds/views/newsfeed/view.html.php      |  2 +-
 libraries/joomla/feed/feed.php                      | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/components/com_newsfeeds/views/newsfeed/view.html.php b/components/com_newsfeeds/views/newsfeed/view.html.php
index aede7f8b1513a..f1bdf3f18d7a1 100644
--- a/components/com_newsfeeds/views/newsfeed/view.html.php
+++ b/components/com_newsfeeds/views/newsfeed/view.html.php
@@ -189,7 +189,7 @@ public function display($tpl = null)
 
 		if ($feed_display_order == 'asc')
 		{
-			$newsfeed->items = array_reverse($newsfeed->items);
+			$this->rssDoc->reverseItems();
 		}
 
 		// Escape strings for HTML output
diff --git a/libraries/joomla/feed/feed.php b/libraries/joomla/feed/feed.php
index 5f17a0d9c291a..b0b1363a6fc34 100644
--- a/libraries/joomla/feed/feed.php
+++ b/libraries/joomla/feed/feed.php
@@ -326,4 +326,17 @@ public function setAuthor($name, $email, $uri = null, $type = null)
 
 		return $this;
 	}
+
+	/** Method to reverse the items if display is set to 'oldest first'
+	 *
+	 * @return JFeed
+	 */
+	public function reverseItems()
+	{
+		if (is_array($this->entries) && !empty($this->entries))
+		{
+			$this->entries = array_reverse($this->entries);
+		}
+		return $this;
+	}
 }

From 18fb974595feb549a9a223b6f17774d47fc927ee Mon Sep 17 00:00:00 2001
From: Nicola Galgano <extensions4joomla@gmail.com>
Date: Mon, 9 Nov 2015 13:12:37 +0100
Subject: [PATCH 017/176] PostgreSQL -  unable to add new article

#### Steps to reproduce the issue
0. Create a new article
1. edit the article
2. create another new article

#### Actual result
the article is created with a strange id =0
1  you are not able to edit
2  not able to save cause of duplicate key

#### Addictional Comments
 pk value is passed like a string sometimes i'm afraid
---
 libraries/joomla/database/driver/postgresql.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/joomla/database/driver/postgresql.php b/libraries/joomla/database/driver/postgresql.php
index f747fa5d54b64..edf769498c6a8 100644
--- a/libraries/joomla/database/driver/postgresql.php
+++ b/libraries/joomla/database/driver/postgresql.php
@@ -1108,7 +1108,7 @@ public function insertObject($table, &$object, $key = null)
 			}
 
 			// Ignore any internal fields or primary keys with value 0.
-			if (($k[0] == "_") || ($k == $key && $v === 0))
+			if (($k[0] == "_") || ($k == $key && (($v === 0)||($v === '0'))))
 			{
 				continue;
 			}

From ffcdd802c5082b5e52fc47f220cb315ca3a8f612 Mon Sep 17 00:00:00 2001
From: Nicola Galgano <extensions4joomla@gmail.com>
Date: Mon, 9 Nov 2015 13:37:00 +0100
Subject: [PATCH 018/176] space add

add a space to the or operator
---
 libraries/joomla/database/driver/postgresql.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/joomla/database/driver/postgresql.php b/libraries/joomla/database/driver/postgresql.php
index edf769498c6a8..f1e9c5d334751 100644
--- a/libraries/joomla/database/driver/postgresql.php
+++ b/libraries/joomla/database/driver/postgresql.php
@@ -1108,7 +1108,7 @@ public function insertObject($table, &$object, $key = null)
 			}
 
 			// Ignore any internal fields or primary keys with value 0.
-			if (($k[0] == "_") || ($k == $key && (($v === 0)||($v === '0'))))
+			if (($k[0] == "_") || ($k == $key && (($v === 0) || ($v === '0'))))
 			{
 				continue;
 			}

From e90832819ea972898e66afca81a71ed08f2bf2f4 Mon Sep 17 00:00:00 2001
From: Tran Duy Hung <nguyentieuhau@gmail.com>
Date: Mon, 9 Nov 2015 23:37:37 +0700
Subject: [PATCH 019/176] Switched plugin list from using JHTML grid.sort to
 searchtools.sort

---
 .../models/forms/filter_plugins.xml           |  43 +-
 .../components/com_plugins/models/plugins.php | 420 ++++++------------
 .../views/plugins/tmpl/default.php            |  22 +-
 .../language/en-GB/en-GB.com_plugins.ini      |   6 +
 4 files changed, 183 insertions(+), 308 deletions(-)

diff --git a/administrator/components/com_plugins/models/forms/filter_plugins.xml b/administrator/components/com_plugins/models/forms/filter_plugins.xml
index 6e7bd07ff06d6..5296e275a4ab9 100644
--- a/administrator/components/com_plugins/models/forms/filter_plugins.xml
+++ b/administrator/components/com_plugins/models/forms/filter_plugins.xml
@@ -38,33 +38,28 @@
 
     <fields name="list">
         <field
-                name="sortTable"
+                name="fullordering"
                 type="list"
                 label="JGLOBAL_SORT_BY"
-                description="JFIELD_ORDERING_DESC"
-                onchange="Joomla.orderTable();"
-                default="a.id DESC"
+                description="JGLOBAL_SORT_BY"
+                onchange="this.form.submit();"
+                default="folder DESC"
                 >
             <option value="">JGLOBAL_SORT_BY</option>
-            <option value="ordering">JGRID_HEADING_ORDERING</option>
-            <option value="enabled">JSTATUS</option>
-            <option value="name">JGLOBAL_TITLE</option>
-            <option value="folder">COM_PLUGINS_FOLDER_HEADING</option>
-            <option value="element">COM_PLUGINS_ELEMENT_HEADING</option>
-            <option value="access">JGRID_HEADING_ACCESS</option>
-            <option value="extension_id">JGRID_HEADING_ID</option>
-        </field>
-
-        <field
-                name="directionTable"
-                type="list"
-                label="JGLOBAL_ORDER_DIRECTION_LABEL"
-                description="JGLOBAL_ORDER_DIRECTION_DESC"
-                onchange="Joomla.orderTable();"
-                >
-            <option value="">JFIELD_ORDERING_DESC</option>
-            <option value="asc">JGLOBAL_ORDER_ASCENDING</option>
-            <option value="desc">JGLOBAL_ORDER_DESCENDING</option>
+            <option value="ordering ASC">JGRID_HEADING_ORDERING_ASC</option>
+            <option value="ordering DESC">JGRID_HEADING_ORDERING_DESC</option>
+            <option value="enabled ASC">JSTATUS_ASC</option>
+            <option value="enabled DESC">JSTATUS_DESC</option>
+            <option value="name ASC">JGLOBAL_TITLE_ASC</option>
+            <option value="name DESC">JGLOBAL_TITLE_DESC</option>
+            <option value="folder ASC">COM_PLUGINS_HEADING_FOLDER_ASC</option>
+            <option value="folder DESC">COM_PLUGINS_HEADING_FOLDER_DESC</option>
+            <option value="element ASC">COM_PLUGINS_HEADING_ELEMENT_ASC</option>
+            <option value="element DESC">COM_PLUGINS_HEADING_ELEMENT_DESC</option>
+            <option value="access ASC">JGRID_HEADING_ACCESS_ASC</option>
+            <option value="access DESC">JGRID_HEADING_ACCESS_DESC</option>
+            <option value="extension_id ASC">JGRID_HEADING_ID_ASC</option>
+            <option value="extension_id DESC">JGRID_HEADING_ID_DESC</option>
         </field>
 
         <field
@@ -75,4 +70,4 @@
                 onchange="this.form.submit();"
                 />
     </fields>
-</form>
\ No newline at end of file
+</form>
diff --git a/administrator/components/com_plugins/models/plugins.php b/administrator/components/com_plugins/models/plugins.php
index fb68d88fd10ae..77a5e4afd0f34 100644
--- a/administrator/components/com_plugins/models/plugins.php
+++ b/administrator/components/com_plugins/models/plugins.php
@@ -9,286 +9,162 @@
 
 defined('_JEXEC') or die;
 
-/**
- * Methods supporting a list of plugin records.
- *
- * @since  1.6
- */
-class PluginsModelPlugins extends JModelList
-{
-	/**
-	 * Constructor.
-	 *
-	 * @param   array  $config  An optional associative array of configuration settings.
-	 *
-	 * @see     JController
-	 * @since   1.6
-	 */
-	public function __construct($config = array())
-	{
-		if (empty($config['filter_fields']))
-		{
-			$config['filter_fields'] = array(
-				'extension_id', 'a.extension_id',
-				'name', 'a.name',
-				'folder', 'a.folder',
-				'element', 'a.element',
-				'checked_out', 'a.checked_out',
-				'checked_out_time', 'a.checked_out_time',
-				'state', 'a.state',
-				'enabled', 'a.enabled',
-				'access', 'a.access', 'access_level',
-				'ordering', 'a.ordering',
-				'client_id', 'a.client_id',
-			);
-		}
-
-		parent::__construct($config);
-	}
+// Include the component HTML helpers.
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
 
-	/**
-	 * Method to auto-populate the model state.
-	 *
-	 * Note. Calling getState in this method will result in recursion.
-	 *
-	 * @param   string  $ordering   An optional ordering field.
-	 * @param   string  $direction  An optional direction (asc|desc).
-	 *
-	 * @return  void
-	 *
-	 * @since   1.6
-	 */
-	protected function populateState($ordering = null, $direction = null)
-	{
-		// Load the filter state.
-		$search = $this->getUserStateFromRequest($this->context . '.filter.search', 'filter_search');
-		$this->setState('filter.search', $search);
-
-		$accessId = $this->getUserStateFromRequest($this->context . '.filter.access', 'filter_access', null, 'int');
-		$this->setState('filter.access', $accessId);
-
-		$state = $this->getUserStateFromRequest($this->context . '.filter.enabled', 'filter_enabled', '', 'string');
-		$this->setState('filter.enabled', $state);
-
-		$folder = $this->getUserStateFromRequest($this->context . '.filter.folder', 'filter_folder', null, 'cmd');
-		$this->setState('filter.folder', $folder);
+JHtml::_('bootstrap.tooltip');
+JHtml::_('behavior.multiselect');
+JHtml::_('formbehavior.chosen', 'select');
 
-		$language = $this->getUserStateFromRequest($this->context . '.filter.language', 'filter_language', '');
-		$this->setState('filter.language', $language);
+$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';
 
-		// Load the parameters.
-		$params = JComponentHelper::getParams('com_plugins');
-		$this->setState('params', $params);
-
-		// List state information.
-		parent::populateState('folder', 'asc');
-	}
-
-	/**
-	 * Method to get a store id based on model configuration state.
-	 *
-	 * This is necessary because the model is used by the component and
-	 * different modules that might need different sets of data or different
-	 * ordering requirements.
-	 *
-	 * @param   string  $id  A prefix for the store id.
-	 *
-	 * @return  string    A store id.
-	 */
-	protected function getStoreId($id = '')
-	{
-		// Compile the store id.
-		$id .= ':' . $this->getState('filter.search');
-		$id .= ':' . $this->getState('filter.access');
-		$id .= ':' . $this->getState('filter.state');
-		$id .= ':' . $this->getState('filter.folder');
-		$id .= ':' . $this->getState('filter.language');
+if ($saveOrder)
+{
+	$saveOrderingUrl = 'index.php?option=com_plugins&task=plugins.saveOrderAjax&tmpl=component';
+	JHtml::_('sortablelist.sortable', 'pluginList', 'adminForm', strtolower($listDirn), $saveOrderingUrl);
+}
 
-		return parent::getStoreId($id);
-	}
+$sortFields = $this->getSortFields();
 
-	/**
-	 * Returns an object list.
-	 *
-	 * @param   JDatabaseQuery  $query       A database query object.
-	 * @param   integer         $limitstart  Offset.
-	 * @param   integer         $limit       The number of records.
-	 *
-	 * @return  array
-	 */
-	protected function _getList($query, $limitstart = 0, $limit = 0)
+JFactory::getDocument()->addScriptDeclaration('
+	Joomla.orderTable = function()
 	{
-		$search = $this->getState('filter.search');
-		$ordering = $this->getState('list.ordering', 'ordering');
-
-		// If "Sort Table By:" is not set, set ordering to name
-		if ($ordering == '')
-		{
-			$ordering = "name";
-		}
-
-		if ($ordering == 'name' || (!empty($search) && stripos($search, 'id:') !== 0))
+		table = document.getElementById("list_sortTable");
+		direction = document.getElementById("list_directionTable");
+		order = table.options[table.selectedIndex].value;
+		if (order != "' . $listOrder . '")
 		{
-			$this->_db->setQuery($query);
-			$result = $this->_db->loadObjectList();
-			$this->translate($result);
-
-			if (!empty($search))
-			{
-				$escapedSearchString = $this->refineSearchStringToRegex($search, '/');
-
-				foreach ($result as $i => $item)
-				{
-					if (!preg_match("/$escapedSearchString/i", $item->name))
-					{
-						unset($result[$i]);
-					}
-				}
-			}
-
-			$direction = ($this->getState('list.direction') == 'desc') ? -1 : 1;
-			JArrayHelper::sortObjects($result, $ordering, $direction, true, true);
-
-			$total = count($result);
-			$this->cache[$this->getStoreId('getTotal')] = $total;
-
-			if ($total < $limitstart)
-			{
-				$limitstart = 0;
-				$this->setState('list.start', 0);
-			}
-
-			return array_slice($result, $limitstart, $limit ? $limit : null);
+			dirn = "asc";
 		}
 		else
 		{
-			if ($ordering == 'ordering')
-			{
-				$query->order('a.folder ASC');
-				$ordering = 'a.ordering';
-			}
-
-			$query->order($this->_db->quoteName($ordering) . ' ' . $this->getState('list.direction'));
-
-			if ($ordering == 'folder')
-			{
-				$query->order('a.ordering ASC');
-			}
-
-			$result = parent::_getList($query, $limitstart, $limit);
-			$this->translate($result);
-
-			return $result;
-		}
-	}
-
-	/**
-	 * Translate a list of objects.
-	 *
-	 * @param   array  &$items  The array of objects.
-	 *
-	 * @return  array The array of translated objects.
-	 */
-	protected function translate(&$items)
-	{
-		$lang = JFactory::getLanguage();
-
-		foreach ($items as &$item)
-		{
-			$source = JPATH_PLUGINS . '/' . $item->folder . '/' . $item->element;
-			$extension = 'plg_' . $item->folder . '_' . $item->element;
-			$lang->load($extension . '.sys', JPATH_ADMINISTRATOR, null, false, true)
-				|| $lang->load($extension . '.sys', $source, null, false, true);
-			$item->name = JText::_($item->name);
-		}
-	}
-
-	/**
-	 * Build an SQL query to load the list data.
-	 *
-	 * @return  JDatabaseQuery
-	 */
-	protected function getListQuery()
-	{
-		// Create a new query object.
-		$db = $this->getDbo();
-		$query = $db->getQuery(true);
-
-		// Select the required fields from the table.
-		$query->select(
-			$this->getState(
-				'list.select',
-				'a.extension_id , a.name, a.element, a.folder, a.checked_out, a.checked_out_time,' .
-					' a.enabled, a.access, a.ordering'
-			)
-		)
-			->from($db->quoteName('#__extensions') . ' AS a')
-			->where($db->quoteName('type') . ' = ' . $db->quote('plugin'));
-
-		// Join over the users for the checked out user.
-		$query->select('uc.name AS editor')
-			->join('LEFT', '#__users AS uc ON uc.id=a.checked_out');
-
-		// Join over the asset groups.
-		$query->select('ag.title AS access_level')
-			->join('LEFT', '#__viewlevels AS ag ON ag.id = a.access');
-
-		// Filter by access level.
-		if ($access = $this->getState('filter.access'))
-		{
-			$query->where('a.access = ' . (int) $access);
-		}
-
-		// Filter by published state.
-		$published = $this->getState('filter.enabled');
-
-		if (is_numeric($published))
-		{
-			$query->where('a.enabled = ' . (int) $published);
+			dirn = direction.options[direction.selectedIndex].value;
 		}
-		elseif ($published === '')
-		{
-			$query->where('(a.enabled IN (0, 1))');
-		}
-
-		// Filter by state.
-		$query->where('a.state >= 0');
-
-		// Filter by folder.
-		if ($folder = $this->getState('filter.folder'))
-		{
-			$query->where('a.folder = ' . $db->quote($folder));
-		}
-
-		// Filter by search in name or id.
-		$search = $this->getState('filter.search');
-
-		if (!empty($search))
-		{
-			if (stripos($search, 'id:') === 0)
-			{
-				$query->where('a.extension_id = ' . (int) substr($search, 3));
-			}
-		}
-
-		return $query;
-	}
-
-	/**
-	 * Method to get the data that should be injected in the form.
-	 *
-	 * @return	mixed	The data for the form.
-	 *
-	 * @since	3.5
-	 */
-	protected function loadFormData()
-	{
-		$data = parent::loadFormData();
-
-		// Set the selected filter values for pages that use the JLayouts for filtering
-		$data->list['sortTable'] = $this->state->get('list.ordering');
-		$data->list['directionTable'] = $this->state->get('list.direction');
-
-		return $data;
-	}
-}
+		Joomla.tableOrdering(order, dirn, "");
+	};
+');
+?>
+
+<form action="<?php echo JRoute::_('index.php?option=com_plugins&view=plugins'); ?>" method="post" name="adminForm" id="adminForm">
+<?php if (!empty( $this->sidebar)) : ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+<?php else : ?>
+	<div id="j-main-container">
+<?php endif;?>
+		<?php echo JLayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
+		<div class="clearfix"> </div>
+		<?php if (empty($this->items)) : ?>
+			<div class="alert alert-no-items">
+				<?php echo JText::_('COM_PLUGINS_MSG_MANAGE_NO_PLUGINS'); ?>
+			</div>
+		<?php else : ?>
+			<table class="table table-striped" id="pluginList">
+				<thead>
+					<tr>
+						<th width="1%" class="hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', '', 'ordering', $listDirn, $listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-menu-2'); ?>
+						</th>
+						<th width="1%" class="hidden-phone">
+							<?php echo JHtml::_('grid.checkall'); ?>
+						</th>
+						<th width="1%" class="nowrap center" style="min-width:55px">
+							<?php echo JHtml::_('searchtools.sort', 'JSTATUS', 'enabled', $listDirn, $listOrder); ?>
+						</th>
+						<th class="title">
+							<?php echo JHtml::_('searchtools.sort', 'COM_PLUGINS_NAME_HEADING', 'name', $listDirn, $listOrder); ?>
+						</th>
+						<th width="10%" class="nowrap hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'COM_PLUGINS_FOLDER_HEADING', 'folder', $listDirn, $listOrder); ?>
+						</th>
+						<th width="10%" class="nowrap hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'COM_PLUGINS_ELEMENT_HEADING', 'element', $listDirn, $listOrder); ?>
+						</th>
+						<th width="5%" class="hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_ACCESS', 'access', $listDirn, $listOrder); ?>
+						</th>
+						<th width="1%" class="nowrap hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_ID', 'extension_id', $listDirn, $listOrder); ?>
+						</th>
+					</tr>
+				</thead>
+				<tfoot>
+					<tr>
+						<td colspan="12">
+							<?php echo $this->pagination->getListFooter(); ?>
+						</td>
+					</tr>
+				</tfoot>
+				<tbody>
+				<?php foreach ($this->items as $i => $item) :
+					$ordering   = ($listOrder == 'ordering');
+					$canEdit    = $user->authorise('core.edit',       'com_plugins');
+					$canCheckin = $user->authorise('core.manage',     'com_checkin') || $item->checked_out == $user->get('id') || $item->checked_out == 0;
+					$canChange  = $user->authorise('core.edit.state', 'com_plugins') && $canCheckin;
+					?>
+					<tr class="row<?php echo $i % 2; ?>" sortable-group-id="<?php echo $item->folder?>">
+						<td class="order nowrap center hidden-phone">
+							<?php
+							$iconClass = '';
+							if (!$canChange)
+							{
+								$iconClass = ' inactive';
+							}
+							elseif (!$saveOrder)
+							{
+								$iconClass = ' inactive tip-top hasTooltip" title="' . JHtml::tooltipText('JORDERINGDISABLED');
+							}
+							?>
+							<span class="sortable-handler<?php echo $iconClass ?>">
+								<span class="icon-menu"></span>
+							</span>
+							<?php if ($canChange && $saveOrder) : ?>
+								<input type="text" style="display:none" name="order[]" size="5" value="<?php echo $item->ordering;?>" class="width-20 text-area-order " />
+							<?php endif; ?>
+						</td>
+						<td class="center hidden-phone">
+							<?php echo JHtml::_('grid.id', $i, $item->extension_id); ?>
+						</td>
+						<td class="center">
+							<?php echo JHtml::_('jgrid.published', $item->enabled, $i, 'plugins.', $canChange); ?>
+						</td>
+						<td>
+							<?php if ($item->checked_out) : ?>
+								<?php echo JHtml::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'plugins.', $canCheckin); ?>
+							<?php endif; ?>
+							<?php if ($canEdit) : ?>
+								<a href="<?php echo JRoute::_('index.php?option=com_plugins&task=plugin.edit&extension_id=' . (int) $item->extension_id); ?>">
+									<?php echo $item->name; ?></a>
+							<?php else : ?>
+									<?php echo $item->name; ?>
+							<?php endif; ?>
+						</td>
+						<td class="nowrap small hidden-phone">
+							<?php echo $this->escape($item->folder);?>
+						</td>
+						<td class="nowrap small hidden-phone">
+							<?php echo $this->escape($item->element);?>
+						</td>
+						<td class="small hidden-phone">
+							<?php echo $this->escape($item->access_level); ?>
+						</td>
+						<td class="hidden-phone">
+							<?php echo (int) $item->extension_id;?>
+						</td>
+					</tr>
+				<?php endforeach; ?>
+				</tbody>
+			</table>
+		<?php endif;?>
+
+		<input type="hidden" name="task" value="" />
+		<input type="hidden" name="boxchecked" value="0" />
+		<?php echo JHtml::_('form.token'); ?>
+	</div>
+</form>
diff --git a/administrator/components/com_plugins/views/plugins/tmpl/default.php b/administrator/components/com_plugins/views/plugins/tmpl/default.php
index 4607e1de798b0..77a5e4afd0f34 100644
--- a/administrator/components/com_plugins/views/plugins/tmpl/default.php
+++ b/administrator/components/com_plugins/views/plugins/tmpl/default.php
@@ -68,29 +68,29 @@
 			<table class="table table-striped" id="pluginList">
 				<thead>
 					<tr>
-						<th width="1%" class="nowrap center">
-							<?php echo JHtml::_('grid.sort', '<span class="icon-menu-2"></span>', 'ordering', $listDirn, $listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
+						<th width="1%" class="hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', '', 'ordering', $listDirn, $listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-menu-2'); ?>
 						</th>
 						<th width="1%" class="hidden-phone">
 							<?php echo JHtml::_('grid.checkall'); ?>
 						</th>
-						<th width="1%" class="nowrap center">
-							<?php echo JHtml::_('grid.sort', 'JSTATUS', 'enabled', $listDirn, $listOrder); ?>
+						<th width="1%" class="nowrap center" style="min-width:55px">
+							<?php echo JHtml::_('searchtools.sort', 'JSTATUS', 'enabled', $listDirn, $listOrder); ?>
 						</th>
 						<th class="title">
-							<?php echo JHtml::_('grid.sort', 'COM_PLUGINS_NAME_HEADING', 'name', $listDirn, $listOrder); ?>
+							<?php echo JHtml::_('searchtools.sort', 'COM_PLUGINS_NAME_HEADING', 'name', $listDirn, $listOrder); ?>
 						</th>
 						<th width="10%" class="nowrap hidden-phone">
-							<?php echo JHtml::_('grid.sort', 'COM_PLUGINS_FOLDER_HEADING', 'folder', $listDirn, $listOrder); ?>
+							<?php echo JHtml::_('searchtools.sort', 'COM_PLUGINS_FOLDER_HEADING', 'folder', $listDirn, $listOrder); ?>
 						</th>
 						<th width="10%" class="nowrap hidden-phone">
-							<?php echo JHtml::_('grid.sort', 'COM_PLUGINS_ELEMENT_HEADING', 'element', $listDirn, $listOrder); ?>
+							<?php echo JHtml::_('searchtools.sort', 'COM_PLUGINS_ELEMENT_HEADING', 'element', $listDirn, $listOrder); ?>
 						</th>
 						<th width="5%" class="hidden-phone">
-							<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_ACCESS', 'access', $listDirn, $listOrder); ?>
+							<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_ACCESS', 'access', $listDirn, $listOrder); ?>
 						</th>
 						<th width="1%" class="nowrap hidden-phone">
-							<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_ID', 'extension_id', $listDirn, $listOrder); ?>
+							<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_ID', 'extension_id', $listDirn, $listOrder); ?>
 						</th>
 					</tr>
 				</thead>
@@ -128,7 +128,7 @@
 								<input type="text" style="display:none" name="order[]" size="5" value="<?php echo $item->ordering;?>" class="width-20 text-area-order " />
 							<?php endif; ?>
 						</td>
-						<td class="center">
+						<td class="center hidden-phone">
 							<?php echo JHtml::_('grid.id', $i, $item->extension_id); ?>
 						</td>
 						<td class="center">
@@ -165,8 +165,6 @@
 
 		<input type="hidden" name="task" value="" />
 		<input type="hidden" name="boxchecked" value="0" />
-		<input type="hidden" name="filter_order" value="<?php echo $listOrder; ?>" />
-		<input type="hidden" name="filter_order_Dir" value="<?php echo $listDirn; ?>" />
 		<?php echo JHtml::_('form.token'); ?>
 	</div>
 </form>
diff --git a/administrator/language/en-GB/en-GB.com_plugins.ini b/administrator/language/en-GB/en-GB.com_plugins.ini
index 3465198601679..0ed5d914a39c6 100644
--- a/administrator/language/en-GB/en-GB.com_plugins.ini
+++ b/administrator/language/en-GB/en-GB.com_plugins.ini
@@ -1,3 +1,5 @@
+
+
 ; Joomla! Project
 ; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
@@ -39,3 +41,7 @@ COM_PLUGINS_XML_ERR="Plugins XML data not available."
 JLIB_HTML_PUBLISH_ITEM="Enable plugin"
 JLIB_HTML_UNPUBLISH_ITEM="Disable plugin"
 JLIB_RULES_SETTING_NOTES="1. Changes apply to this component only.<br /><em><strong>Inherited</strong></em> - a Global Configuration setting or higher level setting is applied.<br /><em><strong>Denied</strong></em> always wins - whatever is set at the Global or higher level and applies to all child elements.<br /><em><strong>Allowed</strong></em> will enable the action for this component unless it is overruled by a Global Configuration setting.<br /><br />2. Select Save to refresh the calculated settings."
+COM_PLUGINS_HEADING_FOLDER_ASC="Type ascending"
+COM_PLUGINS_HEADING_FOLDER_DESC="Type descending"
+COM_PLUGINS_HEADING_ELEMENT_ASC="Element ascending"
+COM_PLUGINS_HEADING_ELEMENT_DESC="Element descending"
\ No newline at end of file

From cd6e004bcd9fb0c4d4d34dcb12a17da5e4ef598c Mon Sep 17 00:00:00 2001
From: Tran Duy Hung <nguyentieuhau@gmail.com>
Date: Mon, 9 Nov 2015 23:38:53 +0700
Subject: [PATCH 020/176] Wrong content

---
 .../components/com_plugins/models/plugins.php | 420 ++++++++++++------
 1 file changed, 272 insertions(+), 148 deletions(-)

diff --git a/administrator/components/com_plugins/models/plugins.php b/administrator/components/com_plugins/models/plugins.php
index 77a5e4afd0f34..fb68d88fd10ae 100644
--- a/administrator/components/com_plugins/models/plugins.php
+++ b/administrator/components/com_plugins/models/plugins.php
@@ -9,162 +9,286 @@
 
 defined('_JEXEC') or die;
 
-// Include the component HTML helpers.
-JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
+/**
+ * Methods supporting a list of plugin records.
+ *
+ * @since  1.6
+ */
+class PluginsModelPlugins extends JModelList
+{
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $config  An optional associative array of configuration settings.
+	 *
+	 * @see     JController
+	 * @since   1.6
+	 */
+	public function __construct($config = array())
+	{
+		if (empty($config['filter_fields']))
+		{
+			$config['filter_fields'] = array(
+				'extension_id', 'a.extension_id',
+				'name', 'a.name',
+				'folder', 'a.folder',
+				'element', 'a.element',
+				'checked_out', 'a.checked_out',
+				'checked_out_time', 'a.checked_out_time',
+				'state', 'a.state',
+				'enabled', 'a.enabled',
+				'access', 'a.access', 'access_level',
+				'ordering', 'a.ordering',
+				'client_id', 'a.client_id',
+			);
+		}
+
+		parent::__construct($config);
+	}
 
-JHtml::_('bootstrap.tooltip');
-JHtml::_('behavior.multiselect');
-JHtml::_('formbehavior.chosen', 'select');
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * Note. Calling getState in this method will result in recursion.
+	 *
+	 * @param   string  $ordering   An optional ordering field.
+	 * @param   string  $direction  An optional direction (asc|desc).
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function populateState($ordering = null, $direction = null)
+	{
+		// Load the filter state.
+		$search = $this->getUserStateFromRequest($this->context . '.filter.search', 'filter_search');
+		$this->setState('filter.search', $search);
 
-$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';
+		$accessId = $this->getUserStateFromRequest($this->context . '.filter.access', 'filter_access', null, 'int');
+		$this->setState('filter.access', $accessId);
 
-if ($saveOrder)
-{
-	$saveOrderingUrl = 'index.php?option=com_plugins&task=plugins.saveOrderAjax&tmpl=component';
-	JHtml::_('sortablelist.sortable', 'pluginList', 'adminForm', strtolower($listDirn), $saveOrderingUrl);
-}
+		$state = $this->getUserStateFromRequest($this->context . '.filter.enabled', 'filter_enabled', '', 'string');
+		$this->setState('filter.enabled', $state);
+
+		$folder = $this->getUserStateFromRequest($this->context . '.filter.folder', 'filter_folder', null, 'cmd');
+		$this->setState('filter.folder', $folder);
+
+		$language = $this->getUserStateFromRequest($this->context . '.filter.language', 'filter_language', '');
+		$this->setState('filter.language', $language);
+
+		// Load the parameters.
+		$params = JComponentHelper::getParams('com_plugins');
+		$this->setState('params', $params);
+
+		// List state information.
+		parent::populateState('folder', 'asc');
+	}
+
+	/**
+	 * Method to get a store id based on model configuration state.
+	 *
+	 * This is necessary because the model is used by the component and
+	 * different modules that might need different sets of data or different
+	 * ordering requirements.
+	 *
+	 * @param   string  $id  A prefix for the store id.
+	 *
+	 * @return  string    A store id.
+	 */
+	protected function getStoreId($id = '')
+	{
+		// Compile the store id.
+		$id .= ':' . $this->getState('filter.search');
+		$id .= ':' . $this->getState('filter.access');
+		$id .= ':' . $this->getState('filter.state');
+		$id .= ':' . $this->getState('filter.folder');
+		$id .= ':' . $this->getState('filter.language');
 
-$sortFields = $this->getSortFields();
+		return parent::getStoreId($id);
+	}
 
-JFactory::getDocument()->addScriptDeclaration('
-	Joomla.orderTable = function()
+	/**
+	 * Returns an object list.
+	 *
+	 * @param   JDatabaseQuery  $query       A database query object.
+	 * @param   integer         $limitstart  Offset.
+	 * @param   integer         $limit       The number of records.
+	 *
+	 * @return  array
+	 */
+	protected function _getList($query, $limitstart = 0, $limit = 0)
 	{
-		table = document.getElementById("list_sortTable");
-		direction = document.getElementById("list_directionTable");
-		order = table.options[table.selectedIndex].value;
-		if (order != "' . $listOrder . '")
+		$search = $this->getState('filter.search');
+		$ordering = $this->getState('list.ordering', 'ordering');
+
+		// If "Sort Table By:" is not set, set ordering to name
+		if ($ordering == '')
+		{
+			$ordering = "name";
+		}
+
+		if ($ordering == 'name' || (!empty($search) && stripos($search, 'id:') !== 0))
 		{
-			dirn = "asc";
+			$this->_db->setQuery($query);
+			$result = $this->_db->loadObjectList();
+			$this->translate($result);
+
+			if (!empty($search))
+			{
+				$escapedSearchString = $this->refineSearchStringToRegex($search, '/');
+
+				foreach ($result as $i => $item)
+				{
+					if (!preg_match("/$escapedSearchString/i", $item->name))
+					{
+						unset($result[$i]);
+					}
+				}
+			}
+
+			$direction = ($this->getState('list.direction') == 'desc') ? -1 : 1;
+			JArrayHelper::sortObjects($result, $ordering, $direction, true, true);
+
+			$total = count($result);
+			$this->cache[$this->getStoreId('getTotal')] = $total;
+
+			if ($total < $limitstart)
+			{
+				$limitstart = 0;
+				$this->setState('list.start', 0);
+			}
+
+			return array_slice($result, $limitstart, $limit ? $limit : null);
 		}
 		else
 		{
-			dirn = direction.options[direction.selectedIndex].value;
+			if ($ordering == 'ordering')
+			{
+				$query->order('a.folder ASC');
+				$ordering = 'a.ordering';
+			}
+
+			$query->order($this->_db->quoteName($ordering) . ' ' . $this->getState('list.direction'));
+
+			if ($ordering == 'folder')
+			{
+				$query->order('a.ordering ASC');
+			}
+
+			$result = parent::_getList($query, $limitstart, $limit);
+			$this->translate($result);
+
+			return $result;
+		}
+	}
+
+	/**
+	 * Translate a list of objects.
+	 *
+	 * @param   array  &$items  The array of objects.
+	 *
+	 * @return  array The array of translated objects.
+	 */
+	protected function translate(&$items)
+	{
+		$lang = JFactory::getLanguage();
+
+		foreach ($items as &$item)
+		{
+			$source = JPATH_PLUGINS . '/' . $item->folder . '/' . $item->element;
+			$extension = 'plg_' . $item->folder . '_' . $item->element;
+			$lang->load($extension . '.sys', JPATH_ADMINISTRATOR, null, false, true)
+				|| $lang->load($extension . '.sys', $source, null, false, true);
+			$item->name = JText::_($item->name);
+		}
+	}
+
+	/**
+	 * Build an SQL query to load the list data.
+	 *
+	 * @return  JDatabaseQuery
+	 */
+	protected function getListQuery()
+	{
+		// Create a new query object.
+		$db = $this->getDbo();
+		$query = $db->getQuery(true);
+
+		// Select the required fields from the table.
+		$query->select(
+			$this->getState(
+				'list.select',
+				'a.extension_id , a.name, a.element, a.folder, a.checked_out, a.checked_out_time,' .
+					' a.enabled, a.access, a.ordering'
+			)
+		)
+			->from($db->quoteName('#__extensions') . ' AS a')
+			->where($db->quoteName('type') . ' = ' . $db->quote('plugin'));
+
+		// Join over the users for the checked out user.
+		$query->select('uc.name AS editor')
+			->join('LEFT', '#__users AS uc ON uc.id=a.checked_out');
+
+		// Join over the asset groups.
+		$query->select('ag.title AS access_level')
+			->join('LEFT', '#__viewlevels AS ag ON ag.id = a.access');
+
+		// Filter by access level.
+		if ($access = $this->getState('filter.access'))
+		{
+			$query->where('a.access = ' . (int) $access);
+		}
+
+		// Filter by published state.
+		$published = $this->getState('filter.enabled');
+
+		if (is_numeric($published))
+		{
+			$query->where('a.enabled = ' . (int) $published);
 		}
-		Joomla.tableOrdering(order, dirn, "");
-	};
-');
-?>
-
-<form action="<?php echo JRoute::_('index.php?option=com_plugins&view=plugins'); ?>" method="post" name="adminForm" id="adminForm">
-<?php if (!empty( $this->sidebar)) : ?>
-	<div id="j-sidebar-container" class="span2">
-		<?php echo $this->sidebar; ?>
-	</div>
-	<div id="j-main-container" class="span10">
-<?php else : ?>
-	<div id="j-main-container">
-<?php endif;?>
-		<?php echo JLayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
-		<div class="clearfix"> </div>
-		<?php if (empty($this->items)) : ?>
-			<div class="alert alert-no-items">
-				<?php echo JText::_('COM_PLUGINS_MSG_MANAGE_NO_PLUGINS'); ?>
-			</div>
-		<?php else : ?>
-			<table class="table table-striped" id="pluginList">
-				<thead>
-					<tr>
-						<th width="1%" class="hidden-phone">
-							<?php echo JHtml::_('searchtools.sort', '', 'ordering', $listDirn, $listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-menu-2'); ?>
-						</th>
-						<th width="1%" class="hidden-phone">
-							<?php echo JHtml::_('grid.checkall'); ?>
-						</th>
-						<th width="1%" class="nowrap center" style="min-width:55px">
-							<?php echo JHtml::_('searchtools.sort', 'JSTATUS', 'enabled', $listDirn, $listOrder); ?>
-						</th>
-						<th class="title">
-							<?php echo JHtml::_('searchtools.sort', 'COM_PLUGINS_NAME_HEADING', 'name', $listDirn, $listOrder); ?>
-						</th>
-						<th width="10%" class="nowrap hidden-phone">
-							<?php echo JHtml::_('searchtools.sort', 'COM_PLUGINS_FOLDER_HEADING', 'folder', $listDirn, $listOrder); ?>
-						</th>
-						<th width="10%" class="nowrap hidden-phone">
-							<?php echo JHtml::_('searchtools.sort', 'COM_PLUGINS_ELEMENT_HEADING', 'element', $listDirn, $listOrder); ?>
-						</th>
-						<th width="5%" class="hidden-phone">
-							<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_ACCESS', 'access', $listDirn, $listOrder); ?>
-						</th>
-						<th width="1%" class="nowrap hidden-phone">
-							<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_ID', 'extension_id', $listDirn, $listOrder); ?>
-						</th>
-					</tr>
-				</thead>
-				<tfoot>
-					<tr>
-						<td colspan="12">
-							<?php echo $this->pagination->getListFooter(); ?>
-						</td>
-					</tr>
-				</tfoot>
-				<tbody>
-				<?php foreach ($this->items as $i => $item) :
-					$ordering   = ($listOrder == 'ordering');
-					$canEdit    = $user->authorise('core.edit',       'com_plugins');
-					$canCheckin = $user->authorise('core.manage',     'com_checkin') || $item->checked_out == $user->get('id') || $item->checked_out == 0;
-					$canChange  = $user->authorise('core.edit.state', 'com_plugins') && $canCheckin;
-					?>
-					<tr class="row<?php echo $i % 2; ?>" sortable-group-id="<?php echo $item->folder?>">
-						<td class="order nowrap center hidden-phone">
-							<?php
-							$iconClass = '';
-							if (!$canChange)
-							{
-								$iconClass = ' inactive';
-							}
-							elseif (!$saveOrder)
-							{
-								$iconClass = ' inactive tip-top hasTooltip" title="' . JHtml::tooltipText('JORDERINGDISABLED');
-							}
-							?>
-							<span class="sortable-handler<?php echo $iconClass ?>">
-								<span class="icon-menu"></span>
-							</span>
-							<?php if ($canChange && $saveOrder) : ?>
-								<input type="text" style="display:none" name="order[]" size="5" value="<?php echo $item->ordering;?>" class="width-20 text-area-order " />
-							<?php endif; ?>
-						</td>
-						<td class="center hidden-phone">
-							<?php echo JHtml::_('grid.id', $i, $item->extension_id); ?>
-						</td>
-						<td class="center">
-							<?php echo JHtml::_('jgrid.published', $item->enabled, $i, 'plugins.', $canChange); ?>
-						</td>
-						<td>
-							<?php if ($item->checked_out) : ?>
-								<?php echo JHtml::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'plugins.', $canCheckin); ?>
-							<?php endif; ?>
-							<?php if ($canEdit) : ?>
-								<a href="<?php echo JRoute::_('index.php?option=com_plugins&task=plugin.edit&extension_id=' . (int) $item->extension_id); ?>">
-									<?php echo $item->name; ?></a>
-							<?php else : ?>
-									<?php echo $item->name; ?>
-							<?php endif; ?>
-						</td>
-						<td class="nowrap small hidden-phone">
-							<?php echo $this->escape($item->folder);?>
-						</td>
-						<td class="nowrap small hidden-phone">
-							<?php echo $this->escape($item->element);?>
-						</td>
-						<td class="small hidden-phone">
-							<?php echo $this->escape($item->access_level); ?>
-						</td>
-						<td class="hidden-phone">
-							<?php echo (int) $item->extension_id;?>
-						</td>
-					</tr>
-				<?php endforeach; ?>
-				</tbody>
-			</table>
-		<?php endif;?>
-
-		<input type="hidden" name="task" value="" />
-		<input type="hidden" name="boxchecked" value="0" />
-		<?php echo JHtml::_('form.token'); ?>
-	</div>
-</form>
+		elseif ($published === '')
+		{
+			$query->where('(a.enabled IN (0, 1))');
+		}
+
+		// Filter by state.
+		$query->where('a.state >= 0');
+
+		// Filter by folder.
+		if ($folder = $this->getState('filter.folder'))
+		{
+			$query->where('a.folder = ' . $db->quote($folder));
+		}
+
+		// Filter by search in name or id.
+		$search = $this->getState('filter.search');
+
+		if (!empty($search))
+		{
+			if (stripos($search, 'id:') === 0)
+			{
+				$query->where('a.extension_id = ' . (int) substr($search, 3));
+			}
+		}
+
+		return $query;
+	}
+
+	/**
+	 * Method to get the data that should be injected in the form.
+	 *
+	 * @return	mixed	The data for the form.
+	 *
+	 * @since	3.5
+	 */
+	protected function loadFormData()
+	{
+		$data = parent::loadFormData();
+
+		// Set the selected filter values for pages that use the JLayouts for filtering
+		$data->list['sortTable'] = $this->state->get('list.ordering');
+		$data->list['directionTable'] = $this->state->get('list.direction');
+
+		return $data;
+	}
+}

From 6324cfed52f9c4f59dc7b07b919ff13e6ed4c655 Mon Sep 17 00:00:00 2001
From: Tran Duy Hung <nguyentieuhau@gmail.com>
Date: Tue, 10 Nov 2015 08:34:27 +0700
Subject: [PATCH 021/176] Alpha ordered the strings and removed empty lines

---
 administrator/language/en-GB/en-GB.com_plugins.ini | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/administrator/language/en-GB/en-GB.com_plugins.ini b/administrator/language/en-GB/en-GB.com_plugins.ini
index 0ed5d914a39c6..516af78b8c254 100644
--- a/administrator/language/en-GB/en-GB.com_plugins.ini
+++ b/administrator/language/en-GB/en-GB.com_plugins.ini
@@ -1,5 +1,3 @@
-
-
 ; Joomla! Project
 ; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
@@ -19,6 +17,10 @@ COM_PLUGINS_FIELD_FOLDER_LABEL="Plugin Type"
 COM_PLUGINS_FIELD_NAME_DESC="The name of the plugin as defined in its xml."
 COM_PLUGINS_FIELD_NAME_LABEL="Plugin Name"
 COM_PLUGINS_FOLDER_HEADING="Type"
+COM_PLUGINS_HEADING_ELEMENT_ASC="Element ascending"
+COM_PLUGINS_HEADING_ELEMENT_DESC="Element descending"
+COM_PLUGINS_HEADING_FOLDER_ASC="Type ascending"
+COM_PLUGINS_HEADING_FOLDER_DESC="Type descending"
 COM_PLUGINS_MANAGER_PLUGIN="Plugins: %s"
 COM_PLUGINS_MANAGER_PLUGINS="Plugins"
 COM_PLUGINS_MSG_MANAGE_NO_PLUGINS="There are no plugins installed matching your query."
@@ -41,7 +43,3 @@ COM_PLUGINS_XML_ERR="Plugins XML data not available."
 JLIB_HTML_PUBLISH_ITEM="Enable plugin"
 JLIB_HTML_UNPUBLISH_ITEM="Disable plugin"
 JLIB_RULES_SETTING_NOTES="1. Changes apply to this component only.<br /><em><strong>Inherited</strong></em> - a Global Configuration setting or higher level setting is applied.<br /><em><strong>Denied</strong></em> always wins - whatever is set at the Global or higher level and applies to all child elements.<br /><em><strong>Allowed</strong></em> will enable the action for this component unless it is overruled by a Global Configuration setting.<br /><br />2. Select Save to refresh the calculated settings."
-COM_PLUGINS_HEADING_FOLDER_ASC="Type ascending"
-COM_PLUGINS_HEADING_FOLDER_DESC="Type descending"
-COM_PLUGINS_HEADING_ELEMENT_ASC="Element ascending"
-COM_PLUGINS_HEADING_ELEMENT_DESC="Element descending"
\ No newline at end of file

From 7e220edcae0da3bb73d561c4269903262ed84061 Mon Sep 17 00:00:00 2001
From: dgt41 <d.grammatiko@gmail.com>
Date: Tue, 10 Nov 2015 23:25:23 +0100
Subject: [PATCH 022/176] fixes should apply only for media field modal

---
 administrator/templates/isis/css/template-rtl.css | 2 +-
 administrator/templates/isis/css/template.css     | 2 +-
 administrator/templates/isis/less/template.less   | 2 +-
 templates/protostar/css/template.css              | 2 +-
 templates/protostar/less/template.less            | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/administrator/templates/isis/css/template-rtl.css b/administrator/templates/isis/css/template-rtl.css
index 0f255654f0aef..71045578b9072 100644
--- a/administrator/templates/isis/css/template-rtl.css
+++ b/administrator/templates/isis/css/template-rtl.css
@@ -8146,7 +8146,7 @@ body.modal-open {
 	overflow: hidden;
 	-ms-overflow-style: none;
 }
-.modal-body {
+.field-media-wrapper .modal .modal-body {
 	padding: 5px 10px;
 	overflow: hidden;
 }
diff --git a/administrator/templates/isis/css/template.css b/administrator/templates/isis/css/template.css
index 009ed340811c3..3e9354ba97a06 100644
--- a/administrator/templates/isis/css/template.css
+++ b/administrator/templates/isis/css/template.css
@@ -8146,7 +8146,7 @@ body.modal-open {
 	overflow: hidden;
 	-ms-overflow-style: none;
 }
-.modal-body {
+.field-media-wrapper .modal .modal-body {
 	padding: 5px 10px;
 	overflow: hidden;
 }
diff --git a/administrator/templates/isis/less/template.less b/administrator/templates/isis/less/template.less
index 238a5b303bcfe..e610ed26a85ca 100644
--- a/administrator/templates/isis/less/template.less
+++ b/administrator/templates/isis/less/template.less
@@ -1297,7 +1297,7 @@ body.modal-open {
 }
 
 /*Corrects the modals padding*/
-.modal-body {
+.field-media-wrapper .modal .modal-body {
 	padding: 5px 10px;
 	overflow: hidden;
 }
\ No newline at end of file
diff --git a/templates/protostar/css/template.css b/templates/protostar/css/template.css
index c4b8e094301f1..1ba67e4bbd3e5 100644
--- a/templates/protostar/css/template.css
+++ b/templates/protostar/css/template.css
@@ -7498,7 +7498,7 @@ body.modal-open {
 #users-profile-custom label {
 	display: inline;
 }
-.modal-body {
+.field-media-wrapper .modal .modal-body {
 	padding: 5px 10px;
 	overflow: hidden;
 }
diff --git a/templates/protostar/less/template.less b/templates/protostar/less/template.less
index df0529b82438f..db4e3b9821837 100644
--- a/templates/protostar/less/template.less
+++ b/templates/protostar/less/template.less
@@ -627,7 +627,7 @@ body.modal-open {
 }
 
 /*Corrects the modals padding*/
-.modal-body {
+.field-media-wrapper .modal .modal-body {
 	padding: 5px 10px;
 	overflow: hidden;
 }
\ No newline at end of file

From 64bc802e7f74b55504723a2b10084ac9833d344b Mon Sep 17 00:00:00 2001
From: Izhar Aazmi <izharaazmi@gmail.com>
Date: Wed, 11 Nov 2015 16:37:48 +0530
Subject: [PATCH 023/176] Fix Jform::bind method JObject handling. Currently it
 converts all nested objects to array silently (see #3737). Some components
 relying on old behavior (prior to #3737) may expect object values for the
 form fields. This fix does not process the entire nested structure, instead
 converts only binding levels to array for internal iterations.

---
 libraries/joomla/form/form.php | 62 +++++++++++++---------------------
 1 file changed, 24 insertions(+), 38 deletions(-)

diff --git a/libraries/joomla/form/form.php b/libraries/joomla/form/form.php
index 45c0d67ed93db..d80f0c54c28bd 100644
--- a/libraries/joomla/form/form.php
+++ b/libraries/joomla/form/form.php
@@ -126,40 +126,7 @@ public function bind($data)
 			return false;
 		}
 
-		// Convert the input to an array.
-		if (is_object($data))
-		{
-			if ($data instanceof Registry)
-			{
-				// Handle a Registry.
-				$data = $data->toArray();
-			}
-			elseif ($data instanceof JObject)
-			{
-				// Handle a JObject. Getting just the properties won't work. We need to convert any nested JObject too.
-				$data = JArrayHelper::fromObject($data);
-			}
-			else
-			{
-				// Handle other types of objects.
-				$data = (array) $data;
-			}
-		}
-
-		// Process the input data.
-		foreach ($data as $k => $v)
-		{
-			if ($this->findField($k))
-			{
-				// If the field exists set the value.
-				$this->data->set($k, $v);
-			}
-			elseif (is_object($v) || JArrayHelper::isAssociative($v))
-			{
-				// If the value is an object or an associative array hand it off to the recursive bind level method.
-				$this->bindLevel($k, $v);
-			}
-		}
+		$this->bindLevel(null, $data);
 
 		return true;
 	}
@@ -177,20 +144,39 @@ public function bind($data)
 	protected function bindLevel($group, $data)
 	{
 		// Ensure the input data is an array.
-		settype($data, 'array');
+		if (is_object($data))
+		{
+			if ($data instanceof Registry)
+			{
+				// Handle a Registry.
+				$data = $data->toArray();
+			}
+			elseif ($data instanceof JObject)
+			{
+				// Handle a JObject.
+				$data = $data->getProperties();
+			}
+			else
+			{
+				// Handle other types of objects.
+				$data = (array) $data;
+			}
+		}
 
 		// Process the input data.
 		foreach ($data as $k => $v)
 		{
+			$level = $group ? $group . '.' . $k : $k;
+
 			if ($this->findField($k, $group))
 			{
 				// If the field exists set the value.
-				$this->data->set($group . '.' . $k, $v);
+				$this->data->set($level, $v);
 			}
 			elseif (is_object($v) || JArrayHelper::isAssociative($v))
 			{
-				// If the value is an object or an associative array, hand it off to the recursive bind level method
-				$this->bindLevel($group . '.' . $k, $v);
+				// If the value is an object or an associative array, hand it off to the recursive bind level method.
+				$this->bindLevel($level, $v);
 			}
 		}
 	}

From 1598dc7bbaacdbe3804f318aa682a74fb0641193 Mon Sep 17 00:00:00 2001
From: Brian Teeman <brian@teeman.net>
Date: Thu, 12 Nov 2015 09:56:36 +0000
Subject: [PATCH 024/176] Update CONTRIBUTING.md

---
 CONTRIBUTING.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 5cb9715546cb8..64b76c9fed6a0 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -2,14 +2,14 @@ Contributing to the Joomla! CMS™
 ===============
 You are welcome to submit a contribution for review and possible inclusion in the Joomla! CMS but, before it will be accepted, we ask that you follow these simple steps:
 
-1) Open an issue on our [Issue Tracker](http://issues.joomla.org/) or here on GitHub. If you can, please provide a fix and create a pull request (PR) instead; this will automatically create an issue for you.
+1) Open an issue on our [Issue Tracker](https://issues.joomla.org/) or here on GitHub. If you can, please provide a fix and create a pull request (PR) instead; this will automatically create an issue for you.
 
-2) Follow the [Joomla! Coding Standards](http://joomla.github.io/coding-standards).
+2) Follow the [Joomla! Coding Standards](https://joomla.github.io/coding-standards).
 
 3) When filing an issue or opening a PR, please include a clear title and description.  The title should be a short summary of an issue and, if possible, should include a reference to an open issue.  For example, `Invalid Query in com_admin (Ref #1234)` would be sufficient.  All issues and PRs should include a description with as much detail as possible. 
 If it is a PR, include what the issue is, what the PR is addressing, testing instructions and environmental information (PHP version, database driver and version, and other data you can retrieve from your site's system information view) in case the issue is specific to certain environments.  If additional information is needed, please be prepared to provide it as our community members review your submission.
 
-4) Report security issues to the Joomla! Security Strike Team (JSST) at security@joomla.org or use the [JSST contact form](http://developer.joomla.org/contact-security-team.html). Please do not use the public tracker for security issues.
+4) Report security issues to the Joomla! Security Strike Team (JSST) at security@joomla.org or use the [JSST contact form](https://developer.joomla.org/contact-security-team.html). Please do not use the public tracker for security issues.
 
 Please be patient as not all items will be tested immediately (remember, all bug testing for the Joomla! CMS is done by volunteers) and be receptive to feedback about your code.
 

From dd61a6cfe8c793fea526d0d62f08ef4d22e5fbea Mon Sep 17 00:00:00 2001
From: Brian Teeman <brian@teeman.net>
Date: Thu, 12 Nov 2015 10:27:07 +0000
Subject: [PATCH 025/176] Update application.xml

---
 .../com_config/model/form/application.xml          | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/administrator/components/com_config/model/form/application.xml b/administrator/components/com_config/model/form/application.xml
index 54c46e2d518bb..e4d0e9c733c4f 100644
--- a/administrator/components/com_config/model/form/application.xml
+++ b/administrator/components/com_config/model/form/application.xml
@@ -9,7 +9,6 @@
 			default="2"
 			label="COM_CONFIG_FIELD_CACHE_LABEL"
 			description="COM_CONFIG_FIELD_CACHE_DESC"
-			required="true"
 			filter="integer">
 			<option value="0">COM_CONFIG_FIELD_VALUE_CACHE_OFF</option>
 			<option value="1">COM_CONFIG_FIELD_VALUE_CACHE_CONSERVATIVE</option>
@@ -399,8 +398,7 @@
 			type="timezone"
 			default="UTC"
 			label="COM_CONFIG_FIELD_SERVER_TIMEZONE_LABEL"
-			description="COM_CONFIG_FIELD_SERVER_TIMEZONE_DESC"
-			required="true">
+			description="COM_CONFIG_FIELD_SERVER_TIMEZONE_DESC">
 			<option value="UTC">JLIB_FORM_VALUE_TIMEZONE_UTC</option>
 		</field>
 	</fieldset>
@@ -428,7 +426,6 @@
 			default="mail"
 			label="COM_CONFIG_FIELD_MAIL_MAILER_LABEL"
 			description="COM_CONFIG_FIELD_MAIL_MAILER_DESC"
-			required="true"
 			filter="word">
 			<option value="mail">COM_CONFIG_FIELD_VALUE_PHP_MAIL</option>
 			<option value="sendmail">COM_CONFIG_FIELD_VALUE_SENDMAIL</option>
@@ -747,7 +744,6 @@
 			default="none"
 			label="COM_CONFIG_FIELD_SESSION_HANDLER_LABEL"
 			description="COM_CONFIG_FIELD_SESSION_HANDLER_DESC"
-			required="true"
 			filter="word" />
 
 		<field
@@ -863,7 +859,6 @@
 			default="tinymce"
 			label="COM_CONFIG_FIELD_DEFAULT_EDITOR_LABEL"
 			description="COM_CONFIG_FIELD_DEFAULT_EDITOR_DESC"
-			required="false"
 			filter="cmd" />
 
 		<field
@@ -873,7 +868,6 @@
 			default="0"
 			label="COM_CONFIG_FIELD_DEFAULT_CAPTCHA_LABEL"
 			description="COM_CONFIG_FIELD_DEFAULT_CAPTCHA_DESC"
-			required="true"
 			filter="cmd">
 			<option value="0">JOPTION_DO_NOT_USE</option>
 		</field>
@@ -884,7 +878,6 @@
 			default="1"
 			label="COM_CONFIG_FIELD_DEFAULT_ACCESS_LEVEL_LABEL"
 			description="COM_CONFIG_FIELD_DEFAULT_ACCESS_LEVEL_DESC"
-			required="true"
 			filter="integer" />
 
 		<field
@@ -952,8 +945,7 @@
 			name="helpurl"
 			type="helpsite"
 			label="COM_CONFIG_FIELD_HELP_SERVER_LABEL"
-			description="COM_CONFIG_FIELD_HELP_SERVER_DESC"
-			required="true" />
+			description="COM_CONFIG_FIELD_HELP_SERVER_DESC" />
 	</fieldset>
 
 	<fieldset
@@ -964,7 +956,6 @@
 			type="text"
 			label="COM_CONFIG_FIELD_COOKIE_DOMAIN_LABEL"
 			description="COM_CONFIG_FIELD_COOKIE_DOMAIN_DESC"
-			required="false"
 			filter="string"
 			size="40" />
 
@@ -973,7 +964,6 @@
 			type="text"
 			label="COM_CONFIG_FIELD_COOKIE_PATH_LABEL"
 			description="COM_CONFIG_FIELD_COOKIE_PATH_DESC"
-			required="false"
 			filter="string"
 			size="40" />
 	</fieldset>

From 41590aea4b2095207a59b5bd0df68afe947564c0 Mon Sep 17 00:00:00 2001
From: Alessandro Pasotti <elpaso@itopen.it>
Date: Thu, 12 Nov 2015 11:36:53 +0100
Subject: [PATCH 026/176] Changed P to DIV since <p><div></div></p> is not
 valid HTML

Also added a "list-item" class to the wrapper div
---
 components/com_contact/views/category/tmpl/default_items.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/com_contact/views/category/tmpl/default_items.php b/components/com_contact/views/category/tmpl/default_items.php
index d5584aa87a4ff..d74c57cd07904 100644
--- a/components/com_contact/views/category/tmpl/default_items.php
+++ b/components/com_contact/views/category/tmpl/default_items.php
@@ -63,7 +63,7 @@
 							<?php endif; ?>
 					</span>
 
-					<p>
+					<div class="list-item">
 						<div class="list-title">
 							<a href="<?php echo JRoute::_(ContactHelperRoute::getContactRoute($item->slug, $item->catid)); ?>">
 								<?php echo $item->name; ?></a>
@@ -93,7 +93,7 @@
 						<?php if ($this->params->get('show_country_headings') AND !empty($item->country)) : ?>
 							<?php echo $item->country; ?><br />
 						<?php endif; ?>
-					</p>
+					</div>
 
 					<?php echo $item->event->afterDisplayContent; ?>
 				</li>

From 6ac268f4f8d6b16d2aee0d92727f733462f37944 Mon Sep 17 00:00:00 2001
From: Brian Teeman <brian@teeman.net>
Date: Thu, 12 Nov 2015 10:42:38 +0000
Subject: [PATCH 027/176] Update sysinfo.php

---
 administrator/components/com_admin/models/sysinfo.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/administrator/components/com_admin/models/sysinfo.php b/administrator/components/com_admin/models/sysinfo.php
index 923c0bb5738b6..8d695eb2056f6 100644
--- a/administrator/components/com_admin/models/sysinfo.php
+++ b/administrator/components/com_admin/models/sysinfo.php
@@ -69,6 +69,7 @@ class AdminModelSysInfo extends JModelLegacy
 	protected $privateSettings = array(
 		'phpInfoArray' => array(
 			'CONTEXT_DOCUMENT_ROOT',
+			'Cookie',
 			'DOCUMENT_ROOT',
 			'extension_dir',
 			'Host',

From fcb6be520411f03339bddd3bee13836a1d5cdc7e Mon Sep 17 00:00:00 2001
From: Brian Teeman <brian@teeman.net>
Date: Thu, 12 Nov 2015 11:13:13 +0000
Subject: [PATCH 028/176] Update en-GB.xml

---
 administrator/language/en-GB/en-GB.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/administrator/language/en-GB/en-GB.xml b/administrator/language/en-GB/en-GB.xml
index c8f797f2b1555..9e9935e2e8d3c 100644
--- a/administrator/language/en-GB/en-GB.xml
+++ b/administrator/language/en-GB/en-GB.xml
@@ -2,7 +2,7 @@
 <metafile version="3.5" client="administrator">
 	<name>English (en-GB)</name>
 	<version>3.5.0</version>
-	<creationDate>2013-03-07</creationDate>
+	<creationDate>November 2015</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>

From b9aa4f755c7d526b0643ece3c9a07ab0b3163dc4 Mon Sep 17 00:00:00 2001
From: Brian Teeman <brian@teeman.net>
Date: Thu, 12 Nov 2015 11:13:45 +0000
Subject: [PATCH 029/176] Update en-GB.xml

---
 language/en-GB/en-GB.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/language/en-GB/en-GB.xml b/language/en-GB/en-GB.xml
index ecdf13bc1692c..85850083b810d 100644
--- a/language/en-GB/en-GB.xml
+++ b/language/en-GB/en-GB.xml
@@ -2,7 +2,7 @@
 <metafile version="3.5" client="site">
 	<name>English (en-GB)</name>
 	<version>3.5.0</version>
-	<creationDate>2013-03-07</creationDate>
+	<creationDate>November 2015</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>

From a030ccf30f8165f5ba6f569daed7b3af5803b11c Mon Sep 17 00:00:00 2001
From: Brian Teeman <brian@teeman.net>
Date: Thu, 12 Nov 2015 12:00:07 +0000
Subject: [PATCH 030/176] use jpath_base not jexec

---
 layouts/joomla/content/blog_style_default_item_title.php   | 2 +-
 layouts/joomla/content/blog_style_default_links.php        | 2 +-
 layouts/joomla/content/categories_default.php              | 2 +-
 layouts/joomla/content/categories_default_items.php        | 2 +-
 layouts/joomla/content/intro_image.php                     | 2 +-
 layouts/joomla/content/options_default.php                 | 2 +-
 layouts/joomla/content/readmore.php                        | 2 ++
 layouts/joomla/edit/associations.php                       | 2 +-
 layouts/joomla/edit/details.php                            | 2 +-
 layouts/joomla/edit/fieldset.php                           | 2 +-
 layouts/joomla/edit/frontediting_modules.php               | 2 +-
 layouts/joomla/edit/global.php                             | 2 +-
 layouts/joomla/edit/metadata.php                           | 2 +-
 layouts/joomla/edit/params.php                             | 2 +-
 layouts/joomla/edit/publishingdata.php                     | 2 +-
 layouts/joomla/editors/buttons.php                         | 2 +-
 layouts/joomla/editors/buttons/button.php                  | 2 +-
 layouts/joomla/form/field/contenthistory.php               | 2 +-
 layouts/joomla/form/field/media.php                        | 2 +-
 layouts/joomla/form/field/user.php                         | 2 +-
 layouts/joomla/form/renderfield.php                        | 2 +-
 layouts/joomla/form/renderlabel.php                        | 2 +-
 layouts/joomla/html/batch/access.php                       | 2 +-
 layouts/joomla/html/batch/item.php                         | 2 +-
 layouts/joomla/html/batch/language.php                     | 2 +-
 layouts/joomla/html/batch/tag.php                          | 2 +-
 layouts/joomla/html/batch/user.php                         | 2 +-
 layouts/joomla/html/formbehavior/ajaxchosen.php            | 2 +-
 layouts/joomla/html/formbehavior/chosen.php                | 2 +-
 layouts/joomla/html/sortablelist.php                       | 2 +-
 layouts/joomla/html/tag.php                                | 2 +-
 layouts/joomla/links/groupclose.php                        | 2 +-
 layouts/joomla/links/groupopen.php                         | 2 +-
 layouts/joomla/links/groupsclose.php                       | 2 +-
 layouts/joomla/links/groupseparator.php                    | 2 +-
 layouts/joomla/links/groupsopen.php                        | 2 +-
 layouts/joomla/links/link.php                              | 2 +-
 layouts/joomla/quickicons/icon.php                         | 2 +-
 layouts/joomla/system/message.php                          | 2 +-
 layouts/joomla/tinymce/buttons.php                         | 2 +-
 layouts/joomla/tinymce/buttons/button.php                  | 2 +-
 layouts/joomla/tinymce/textarea.php                        | 2 +-
 layouts/joomla/tinymce/togglebutton.php                    | 2 +-
 layouts/joomla/toolbar/base.php                            | 2 +-
 layouts/joomla/toolbar/batch.php                           | 2 +-
 layouts/joomla/toolbar/confirm.php                         | 2 +-
 layouts/joomla/toolbar/containerclose.php                  | 2 +-
 layouts/joomla/toolbar/containeropen.php                   | 2 +-
 layouts/joomla/toolbar/help.php                            | 2 +-
 layouts/joomla/toolbar/iconclass.php                       | 2 +-
 layouts/joomla/toolbar/link.php                            | 2 +-
 layouts/joomla/toolbar/popup.php                           | 2 +-
 layouts/joomla/toolbar/separator.php                       | 2 +-
 layouts/joomla/toolbar/slider.php                          | 2 +-
 layouts/joomla/toolbar/standard.php                        | 2 +-
 layouts/joomla/toolbar/title.php                           | 2 +-
 layouts/joomla/toolbar/versions.php                        | 2 +-
 layouts/libraries/cms/html/bootstrap/addtab.php            | 2 +-
 layouts/libraries/cms/html/bootstrap/addtabscript.php      | 2 +-
 layouts/libraries/cms/html/bootstrap/endtab.php            | 2 +-
 layouts/libraries/cms/html/bootstrap/endtabset.php         | 2 +-
 layouts/libraries/cms/html/bootstrap/starttabset.php       | 2 +-
 layouts/libraries/cms/html/bootstrap/starttabsetscript.php | 2 +-
 63 files changed, 64 insertions(+), 62 deletions(-)

diff --git a/layouts/joomla/content/blog_style_default_item_title.php b/layouts/joomla/content/blog_style_default_item_title.php
index d4b75ff22da49..d92a9441037d5 100644
--- a/layouts/joomla/content/blog_style_default_item_title.php
+++ b/layouts/joomla/content/blog_style_default_item_title.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('_JEXEC') or die;
+defined('JPATH_BASE') or die;
 
 // Create a shortcut for params.
 $params = $displayData->params;
diff --git a/layouts/joomla/content/blog_style_default_links.php b/layouts/joomla/content/blog_style_default_links.php
index c31ffd3e7fb83..68eb502648f91 100644
--- a/layouts/joomla/content/blog_style_default_links.php
+++ b/layouts/joomla/content/blog_style_default_links.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('_JEXEC') or die;
+defined('JPATH_BASE') or die;
 ?>
 <ol class="nav nav-tabs nav-stacked">
 <?php foreach ($displayData->get('link_items') as $item) : ?>
diff --git a/layouts/joomla/content/categories_default.php b/layouts/joomla/content/categories_default.php
index 6fe87c7e25ef9..4d5968a4c9fbb 100644
--- a/layouts/joomla/content/categories_default.php
+++ b/layouts/joomla/content/categories_default.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('_JEXEC') or die;
+defined('JPATH_BASE') or die;
 
 ?>
 <?php if ($displayData->params->get('show_page_heading')) : ?>
diff --git a/layouts/joomla/content/categories_default_items.php b/layouts/joomla/content/categories_default_items.php
index cdd445ebdc58a..cc5300e681620 100644
--- a/layouts/joomla/content/categories_default_items.php
+++ b/layouts/joomla/content/categories_default_items.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('_JEXEC') or die;
+defined('JPATH_BASE') or die;
 
 $class = ' class="first"';
 JHtml::_('bootstrap.tooltip');
diff --git a/layouts/joomla/content/intro_image.php b/layouts/joomla/content/intro_image.php
index 4a7b1a1f85d19..6e9d2c4413e41 100644
--- a/layouts/joomla/content/intro_image.php
+++ b/layouts/joomla/content/intro_image.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('_JEXEC') or die;
+defined('JPATH_BASE') or die;
 $params  = $displayData->params;
 ?>
 <?php $images = json_decode($displayData->images); ?>
diff --git a/layouts/joomla/content/options_default.php b/layouts/joomla/content/options_default.php
index 4b39672bc841f..1b9bfca1b1188 100644
--- a/layouts/joomla/content/options_default.php
+++ b/layouts/joomla/content/options_default.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('_JEXEC') or die;
+defined('JPATH_BASE') or die;
 
 ?>
 <fieldset class="<?php echo !empty($displayData->formclass) ? $displayData->formclass : 'form-horizontal'; ?>">
diff --git a/layouts/joomla/content/readmore.php b/layouts/joomla/content/readmore.php
index f778f088ce050..9303af1ead2da 100644
--- a/layouts/joomla/content/readmore.php
+++ b/layouts/joomla/content/readmore.php
@@ -7,6 +7,8 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
+defined('JPATH_BASE') or die;
+
 $params = $displayData['params'];
 $item = $displayData['item'];
 ?>
diff --git a/layouts/joomla/edit/associations.php b/layouts/joomla/edit/associations.php
index ce96e2a9e0b92..4d24b902cdce8 100644
--- a/layouts/joomla/edit/associations.php
+++ b/layouts/joomla/edit/associations.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('_JEXEC') or die;
+defined('JPATH_BASE') or die;
 
 // JLayout for standard handling of associations fields in the administrator items edit screens.
 echo $displayData->getForm()->renderFieldset('item_associations');
diff --git a/layouts/joomla/edit/details.php b/layouts/joomla/edit/details.php
index c8fce6ed0f0be..1ca070bc38e69 100644
--- a/layouts/joomla/edit/details.php
+++ b/layouts/joomla/edit/details.php
@@ -9,7 +9,7 @@
  * @deprecated  3.2
  */
 
-defined('_JEXEC') or die;
+defined('JPATH_BASE') or die;;
 
 $app = JFactory::getApplication();
 
diff --git a/layouts/joomla/edit/fieldset.php b/layouts/joomla/edit/fieldset.php
index 0593052cc8ff8..746a4dcb2399b 100644
--- a/layouts/joomla/edit/fieldset.php
+++ b/layouts/joomla/edit/fieldset.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('_JEXEC') or die;
+defined('JPATH_BASE') or die;
 
 $app = JFactory::getApplication();
 $form = $displayData->getForm();
diff --git a/layouts/joomla/edit/frontediting_modules.php b/layouts/joomla/edit/frontediting_modules.php
index eeebe95b1b3b4..d308d34826cd1 100644
--- a/layouts/joomla/edit/frontediting_modules.php
+++ b/layouts/joomla/edit/frontediting_modules.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('_JEXEC') or die;
+defined('JPATH_BASE') or die;
 
 // JLayout for standard handling of the edit modules:
 
diff --git a/layouts/joomla/edit/global.php b/layouts/joomla/edit/global.php
index 2a8708214a3b8..1f5bc17023c7f 100644
--- a/layouts/joomla/edit/global.php
+++ b/layouts/joomla/edit/global.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('_JEXEC') or die;
+defined('JPATH_BASE') or die;
 
 $app       = JFactory::getApplication();
 $form      = $displayData->getForm();
diff --git a/layouts/joomla/edit/metadata.php b/layouts/joomla/edit/metadata.php
index b0c637a9387d4..4f8e70f7a98b1 100644
--- a/layouts/joomla/edit/metadata.php
+++ b/layouts/joomla/edit/metadata.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('_JEXEC') or die;
+defined('JPATH_BASE') or die;
 
 $form = $displayData->getForm();
 
diff --git a/layouts/joomla/edit/params.php b/layouts/joomla/edit/params.php
index 88bfa369420dc..bb5374e635d5c 100644
--- a/layouts/joomla/edit/params.php
+++ b/layouts/joomla/edit/params.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('_JEXEC') or die;
+defined('JPATH_BASE') or die;
 
 $app       = JFactory::getApplication();
 $form      = $displayData->getForm();
diff --git a/layouts/joomla/edit/publishingdata.php b/layouts/joomla/edit/publishingdata.php
index 3ad904ccff07d..b712bbdc4a048 100644
--- a/layouts/joomla/edit/publishingdata.php
+++ b/layouts/joomla/edit/publishingdata.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('_JEXEC') or die;
+defined('JPATH_BASE') or die;
 
 $app = JFactory::getApplication();
 $form = $displayData->getForm();
diff --git a/layouts/joomla/editors/buttons.php b/layouts/joomla/editors/buttons.php
index 47aad968d540f..6a6bb262470ea 100644
--- a/layouts/joomla/editors/buttons.php
+++ b/layouts/joomla/editors/buttons.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('_JEXEC') or die;
+defined('JPATH_BASE') or die;
 
 $buttons = $displayData;
 
diff --git a/layouts/joomla/editors/buttons/button.php b/layouts/joomla/editors/buttons/button.php
index ea6603e113e88..5a73a5e060bd0 100644
--- a/layouts/joomla/editors/buttons/button.php
+++ b/layouts/joomla/editors/buttons/button.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('_JEXEC') or die;
+defined('JPATH_BASE') or die;
 
 $button = $displayData;
 
diff --git a/layouts/joomla/form/field/contenthistory.php b/layouts/joomla/form/field/contenthistory.php
index 5b79c0714215c..d7136a35de9ed 100644
--- a/layouts/joomla/form/field/contenthistory.php
+++ b/layouts/joomla/form/field/contenthistory.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('_JEXEC') or die;
+defined('JPATH_BASE') or die;
 
 /**
  * Layout variables
diff --git a/layouts/joomla/form/field/media.php b/layouts/joomla/form/field/media.php
index c8823ef94c25a..a49ebf0279103 100644
--- a/layouts/joomla/form/field/media.php
+++ b/layouts/joomla/form/field/media.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('_JEXEC') or die;
+defined('JPATH_BASE') or die;
 
 /**
  * Layout variables
diff --git a/layouts/joomla/form/field/user.php b/layouts/joomla/form/field/user.php
index 8811a67dc210c..2b63586c2dcab 100644
--- a/layouts/joomla/form/field/user.php
+++ b/layouts/joomla/form/field/user.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('_JEXEC') or die;
+defined('JPATH_BASE') or die;
 
 extract($displayData);
 
diff --git a/layouts/joomla/form/renderfield.php b/layouts/joomla/form/renderfield.php
index 72a3b76982f71..9632d8fc27ca7 100644
--- a/layouts/joomla/form/renderfield.php
+++ b/layouts/joomla/form/renderfield.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('_JEXEC') or die;
+defined('JPATH_BASE') or die;
 
 /**
  * Layout variables
diff --git a/layouts/joomla/form/renderlabel.php b/layouts/joomla/form/renderlabel.php
index 0520c9f481a9e..443f1268711f1 100644
--- a/layouts/joomla/form/renderlabel.php
+++ b/layouts/joomla/form/renderlabel.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('_JEXEC') or die;
+defined('JPATH_BASE') or die;
 
 /**
  * Layout variables
diff --git a/layouts/joomla/html/batch/access.php b/layouts/joomla/html/batch/access.php
index a583054a200b2..9649401ab9cbf 100644
--- a/layouts/joomla/html/batch/access.php
+++ b/layouts/joomla/html/batch/access.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('_JEXEC') or die;
+defined('JPATH_BASE') or die;
 
 /**
  * Layout variables
diff --git a/layouts/joomla/html/batch/item.php b/layouts/joomla/html/batch/item.php
index 5947333853093..bc924bbc86e4c 100644
--- a/layouts/joomla/html/batch/item.php
+++ b/layouts/joomla/html/batch/item.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('_JEXEC') or die;
+defined('JPATH_BASE') or die;
 
 /**
  * Layout variables
diff --git a/layouts/joomla/html/batch/language.php b/layouts/joomla/html/batch/language.php
index 5607228556c97..35fe4e037647c 100644
--- a/layouts/joomla/html/batch/language.php
+++ b/layouts/joomla/html/batch/language.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('_JEXEC') or die;
+defined('JPATH_BASE') or die;
 
 /**
  * Layout variables
diff --git a/layouts/joomla/html/batch/tag.php b/layouts/joomla/html/batch/tag.php
index a4e9cd2554c83..2933ba9fd16cd 100644
--- a/layouts/joomla/html/batch/tag.php
+++ b/layouts/joomla/html/batch/tag.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('_JEXEC') or die;
+defined('JPATH_BASE') or die;
 
 /**
  * Layout variables
diff --git a/layouts/joomla/html/batch/user.php b/layouts/joomla/html/batch/user.php
index 7efba9c0aaa40..d4c74f5f4cbd8 100644
--- a/layouts/joomla/html/batch/user.php
+++ b/layouts/joomla/html/batch/user.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('_JEXEC') or die;
+defined('JPATH_BASE') or die;
 
 /**
  * Layout variables
diff --git a/layouts/joomla/html/formbehavior/ajaxchosen.php b/layouts/joomla/html/formbehavior/ajaxchosen.php
index 803117450f405..b42d05928d1de 100644
--- a/layouts/joomla/html/formbehavior/ajaxchosen.php
+++ b/layouts/joomla/html/formbehavior/ajaxchosen.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('_JEXEC') or die;
+defined('JPATH_BASE') or die;
 
 /**
  * Layout variables
diff --git a/layouts/joomla/html/formbehavior/chosen.php b/layouts/joomla/html/formbehavior/chosen.php
index a835f3f521c20..3848d2f5cf28c 100644
--- a/layouts/joomla/html/formbehavior/chosen.php
+++ b/layouts/joomla/html/formbehavior/chosen.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('_JEXEC') or die;
+defined('JPATH_BASE') or die;
 
 /**
  * Layout variables
diff --git a/layouts/joomla/html/sortablelist.php b/layouts/joomla/html/sortablelist.php
index 55a074138b7f6..76b1533d4d462 100644
--- a/layouts/joomla/html/sortablelist.php
+++ b/layouts/joomla/html/sortablelist.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('_JEXEC') or die;
+defined('JPATH_BASE') or die;
 
 /**
  * Layout variables
diff --git a/layouts/joomla/html/tag.php b/layouts/joomla/html/tag.php
index 188efba361e27..5efd9dad84749 100644
--- a/layouts/joomla/html/tag.php
+++ b/layouts/joomla/html/tag.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('_JEXEC') or die;
+defined('JPATH_BASE') or die;
 
 use Joomla\Registry\Registry;
 
diff --git a/layouts/joomla/links/groupclose.php b/layouts/joomla/links/groupclose.php
index 9f45cf779a826..75632754b76ad 100644
--- a/layouts/joomla/links/groupclose.php
+++ b/layouts/joomla/links/groupclose.php
@@ -7,6 +7,6 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('_JEXEC') or die;
+defined('JPATH_BASE') or die;
 ?>
 	</ul>
diff --git a/layouts/joomla/links/groupopen.php b/layouts/joomla/links/groupopen.php
index 7a1800a552630..d8dea9fd9895b 100644
--- a/layouts/joomla/links/groupopen.php
+++ b/layouts/joomla/links/groupopen.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('_JEXEC') or die;
+defined('JPATH_BASE') or die;
 ?>
 <h2 class="nav-header"><?php echo JFilterOutput::ampReplace(JText::_($displayData)); ?></h2>
 <ul class="j-links-group nav nav-list">
diff --git a/layouts/joomla/links/groupsclose.php b/layouts/joomla/links/groupsclose.php
index d0d2524540088..b91d57bb2503d 100644
--- a/layouts/joomla/links/groupsclose.php
+++ b/layouts/joomla/links/groupsclose.php
@@ -7,6 +7,6 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('_JEXEC') or die;
+defined('JPATH_BASE') or die;
 ?>
 </div>
diff --git a/layouts/joomla/links/groupseparator.php b/layouts/joomla/links/groupseparator.php
index ed03bf4531c73..c543d6a64cc9d 100644
--- a/layouts/joomla/links/groupseparator.php
+++ b/layouts/joomla/links/groupseparator.php
@@ -7,6 +7,6 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('_JEXEC') or die;
+defined('JPATH_BASE') or die;
 ?>
 <div class="j-links-separator"></div>
diff --git a/layouts/joomla/links/groupsopen.php b/layouts/joomla/links/groupsopen.php
index ba3f08f70eb3a..15235eeab7073 100644
--- a/layouts/joomla/links/groupsopen.php
+++ b/layouts/joomla/links/groupsopen.php
@@ -7,6 +7,6 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('_JEXEC') or die;
+defined('JPATH_BASE') or die;
 ?>
 <div class="j-links-groups">
\ No newline at end of file
diff --git a/layouts/joomla/links/link.php b/layouts/joomla/links/link.php
index d4a82ababe3db..68a8e86a5dd83 100644
--- a/layouts/joomla/links/link.php
+++ b/layouts/joomla/links/link.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('_JEXEC') or die;
+defined('JPATH_BASE') or die;
 
 $id      = empty($displayData['id']) ? '' : (' id="' . $displayData['id'] . '"');
 $target  = empty($displayData['target']) ? '' : (' target="' . $displayData['target'] . '"');
diff --git a/layouts/joomla/quickicons/icon.php b/layouts/joomla/quickicons/icon.php
index bf05cc09034b8..048286acfd4d7 100644
--- a/layouts/joomla/quickicons/icon.php
+++ b/layouts/joomla/quickicons/icon.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('_JEXEC') or die;
+defined('JPATH_BASE') or die;
 
 $id      = empty($displayData['id']) ? '' : (' id="' . $displayData['id'] . '"');
 $target  = empty($displayData['target']) ? '' : (' target="' . $displayData['target'] . '"');
diff --git a/layouts/joomla/system/message.php b/layouts/joomla/system/message.php
index 54c00d51f8fde..69e5b2205a1b7 100644
--- a/layouts/joomla/system/message.php
+++ b/layouts/joomla/system/message.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('_JEXEC') or die;
+defined('JPATH_BASE') or die;
 
 $msgList = $displayData['msgList'];
 
diff --git a/layouts/joomla/tinymce/buttons.php b/layouts/joomla/tinymce/buttons.php
index 7e5616e02207c..d59cdb938d328 100644
--- a/layouts/joomla/tinymce/buttons.php
+++ b/layouts/joomla/tinymce/buttons.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('_JEXEC') or die;
+defined('JPATH_BASE') or die;
 
 JLog::add('The layout joomla.tinymce.buttons is deprecated, use joomla.editors.buttons instead.', JLog::WARNING, 'deprecated');
 echo JLayoutHelper::render('joomla.editors.buttons', $displayData);
diff --git a/layouts/joomla/tinymce/buttons/button.php b/layouts/joomla/tinymce/buttons/button.php
index 38586e76aecbc..d363eec5d7e85 100644
--- a/layouts/joomla/tinymce/buttons/button.php
+++ b/layouts/joomla/tinymce/buttons/button.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('_JEXEC') or die;
+defined('JPATH_BASE') or die;
 
 JLog::add('The layout joomla.tinymce.buttons.button is deprecated, use joomla.editors.buttons.button instead.', JLog::WARNING, 'deprecated');
 echo JLayoutHelper::render('joomla.editors.buttons.button', $displayData);
diff --git a/layouts/joomla/tinymce/textarea.php b/layouts/joomla/tinymce/textarea.php
index 2ca0fa1a52109..cce4a61a256d5 100644
--- a/layouts/joomla/tinymce/textarea.php
+++ b/layouts/joomla/tinymce/textarea.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('_JEXEC') or die;
+defined('JPATH_BASE') or die;
 
 $data = $displayData;
 
diff --git a/layouts/joomla/tinymce/togglebutton.php b/layouts/joomla/tinymce/togglebutton.php
index b6aa38defae42..98ac711c32507 100644
--- a/layouts/joomla/tinymce/togglebutton.php
+++ b/layouts/joomla/tinymce/togglebutton.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('_JEXEC') or die;
+defined('JPATH_BASE') or die;
 
 $name = $displayData;
 
diff --git a/layouts/joomla/toolbar/base.php b/layouts/joomla/toolbar/base.php
index 36c144be4e229..1d705ec321aa3 100644
--- a/layouts/joomla/toolbar/base.php
+++ b/layouts/joomla/toolbar/base.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('_JEXEC') or die;
+defined('JPATH_BASE') or die;
 ?>
 <div class="btn-wrapper" <?php echo $displayData['id']; ?>>
 	<?php echo $displayData['action']; ?>
diff --git a/layouts/joomla/toolbar/batch.php b/layouts/joomla/toolbar/batch.php
index e15cb682d023b..595d9459869a3 100644
--- a/layouts/joomla/toolbar/batch.php
+++ b/layouts/joomla/toolbar/batch.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('_JEXEC') or die;
+defined('JPATH_BASE') or die;
 
 JHtml::_('behavior.core');
 
diff --git a/layouts/joomla/toolbar/confirm.php b/layouts/joomla/toolbar/confirm.php
index 096c1a47dca9b..b62f4a387fabd 100644
--- a/layouts/joomla/toolbar/confirm.php
+++ b/layouts/joomla/toolbar/confirm.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('_JEXEC') or die;
+defined('JPATH_BASE') or die;
 
 JHtml::_('behavior.core');
 
diff --git a/layouts/joomla/toolbar/containerclose.php b/layouts/joomla/toolbar/containerclose.php
index d0d2524540088..b91d57bb2503d 100644
--- a/layouts/joomla/toolbar/containerclose.php
+++ b/layouts/joomla/toolbar/containerclose.php
@@ -7,6 +7,6 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('_JEXEC') or die;
+defined('JPATH_BASE') or die;
 ?>
 </div>
diff --git a/layouts/joomla/toolbar/containeropen.php b/layouts/joomla/toolbar/containeropen.php
index 2b4bb2f202f57..a469bbd629b70 100644
--- a/layouts/joomla/toolbar/containeropen.php
+++ b/layouts/joomla/toolbar/containeropen.php
@@ -7,6 +7,6 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('_JEXEC') or die;
+defined('JPATH_BASE') or die;
 ?>
 <div class="btn-toolbar" id="<?php echo $displayData['id']; ?>">
diff --git a/layouts/joomla/toolbar/help.php b/layouts/joomla/toolbar/help.php
index 351717a4c37f4..8a4d5c1f7aaa4 100644
--- a/layouts/joomla/toolbar/help.php
+++ b/layouts/joomla/toolbar/help.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('_JEXEC') or die;
+defined('JPATH_BASE') or die;
 
 JHtml::_('behavior.core');
 
diff --git a/layouts/joomla/toolbar/iconclass.php b/layouts/joomla/toolbar/iconclass.php
index 73438459984c9..67e5385094c0c 100644
--- a/layouts/joomla/toolbar/iconclass.php
+++ b/layouts/joomla/toolbar/iconclass.php
@@ -7,6 +7,6 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('_JEXEC') or die;
+defined('JPATH_BASE') or die;
 ?>
 icon-<?php echo $displayData['icon']; ?>
diff --git a/layouts/joomla/toolbar/link.php b/layouts/joomla/toolbar/link.php
index f58844cc8ee78..4f7034e0d5b61 100644
--- a/layouts/joomla/toolbar/link.php
+++ b/layouts/joomla/toolbar/link.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('_JEXEC') or die;
+defined('JPATH_BASE') or die;
 
 $doTask = $displayData['doTask'];
 $class  = $displayData['class'];
diff --git a/layouts/joomla/toolbar/popup.php b/layouts/joomla/toolbar/popup.php
index 296e1b2bb920c..3db0c1525e9d3 100644
--- a/layouts/joomla/toolbar/popup.php
+++ b/layouts/joomla/toolbar/popup.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('_JEXEC') or die;
+defined('JPATH_BASE') or die;;
 
 JHtml::_('behavior.core');
 
diff --git a/layouts/joomla/toolbar/separator.php b/layouts/joomla/toolbar/separator.php
index 69abfcee3eaae..6912123938721 100644
--- a/layouts/joomla/toolbar/separator.php
+++ b/layouts/joomla/toolbar/separator.php
@@ -7,4 +7,4 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('_JEXEC') or die;
+defined('JPATH_BASE') or die;
diff --git a/layouts/joomla/toolbar/slider.php b/layouts/joomla/toolbar/slider.php
index 2444212ab6bf1..4acd04747c4d1 100644
--- a/layouts/joomla/toolbar/slider.php
+++ b/layouts/joomla/toolbar/slider.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('_JEXEC') or die;
+defined('JPATH_BASE') or die;
 
 JHtml::_('behavior.core');
 
diff --git a/layouts/joomla/toolbar/standard.php b/layouts/joomla/toolbar/standard.php
index 34aacfc231b2b..5ba93f5fdf20b 100644
--- a/layouts/joomla/toolbar/standard.php
+++ b/layouts/joomla/toolbar/standard.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('_JEXEC') or die;
+defined('JPATH_BASE') or die;
 
 JHtml::_('behavior.core');
 
diff --git a/layouts/joomla/toolbar/title.php b/layouts/joomla/toolbar/title.php
index b471a93cc2cbc..2aeb0b0a298f9 100644
--- a/layouts/joomla/toolbar/title.php
+++ b/layouts/joomla/toolbar/title.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('_JEXEC') or die;
+defined('JPATH_BASE') or die;
 
 $icon = empty($displayData['icon']) ? 'generic' : preg_replace('#\.[^ .]*$#', '', $displayData['icon']);
 ?>
diff --git a/layouts/joomla/toolbar/versions.php b/layouts/joomla/toolbar/versions.php
index 9cf4a3d3cf594..21b34090665ab 100644
--- a/layouts/joomla/toolbar/versions.php
+++ b/layouts/joomla/toolbar/versions.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('_JEXEC') or die;
+defined('JPATH_BASE') or die;
 
 JHtml::_('behavior.framework');
 
diff --git a/layouts/libraries/cms/html/bootstrap/addtab.php b/layouts/libraries/cms/html/bootstrap/addtab.php
index 7626a18c49a4d..e5512bf6789b1 100644
--- a/layouts/libraries/cms/html/bootstrap/addtab.php
+++ b/layouts/libraries/cms/html/bootstrap/addtab.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('_JEXEC') or die;
+defined('JPATH_BASE') or die;
 
 $id = empty($displayData['id']) ? '' : $displayData['id'];
 $active = empty($displayData['active']) ? '' : $displayData['active'];
diff --git a/layouts/libraries/cms/html/bootstrap/addtabscript.php b/layouts/libraries/cms/html/bootstrap/addtabscript.php
index f226396effadd..40ec495ba6169 100644
--- a/layouts/libraries/cms/html/bootstrap/addtabscript.php
+++ b/layouts/libraries/cms/html/bootstrap/addtabscript.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('_JEXEC') or die;
+defined('JPATH_BASE') or die;
 
 $selector = empty($displayData['selector']) ? '' : $displayData['selector'];
 $id = empty($displayData['id']) ? '' : $displayData['id'];
diff --git a/layouts/libraries/cms/html/bootstrap/endtab.php b/layouts/libraries/cms/html/bootstrap/endtab.php
index 711818214ac7d..942eada8d2e63 100644
--- a/layouts/libraries/cms/html/bootstrap/endtab.php
+++ b/layouts/libraries/cms/html/bootstrap/endtab.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('_JEXEC') or die;
+defined('JPATH_BASE') or die;
 
 ?>
 
diff --git a/layouts/libraries/cms/html/bootstrap/endtabset.php b/layouts/libraries/cms/html/bootstrap/endtabset.php
index 711818214ac7d..942eada8d2e63 100644
--- a/layouts/libraries/cms/html/bootstrap/endtabset.php
+++ b/layouts/libraries/cms/html/bootstrap/endtabset.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('_JEXEC') or die;
+defined('JPATH_BASE') or die;
 
 ?>
 
diff --git a/layouts/libraries/cms/html/bootstrap/starttabset.php b/layouts/libraries/cms/html/bootstrap/starttabset.php
index 43d935bec48ac..71b75f09e2e27 100644
--- a/layouts/libraries/cms/html/bootstrap/starttabset.php
+++ b/layouts/libraries/cms/html/bootstrap/starttabset.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('_JEXEC') or die;
+defined('JPATH_BASE') or die;
 
 $selector = empty($displayData['selector']) ? '' : $displayData['selector'];
 
diff --git a/layouts/libraries/cms/html/bootstrap/starttabsetscript.php b/layouts/libraries/cms/html/bootstrap/starttabsetscript.php
index 3e491c3c5c337..2938a65b6bef4 100644
--- a/layouts/libraries/cms/html/bootstrap/starttabsetscript.php
+++ b/layouts/libraries/cms/html/bootstrap/starttabsetscript.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('_JEXEC') or die;
+defined('JPATH_BASE') or die;
 
 $selector = empty($displayData['selector']) ? '' : $displayData['selector'];
 

From 4e514716cd8eb787514ce3e52a28abc68d6811e3 Mon Sep 17 00:00:00 2001
From: infograf768 <infografjms@gmail.com>
Date: Thu, 12 Nov 2015 13:46:12 +0100
Subject: [PATCH 031/176] Making some database fields required

---
 administrator/components/com_config/model/form/application.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/administrator/components/com_config/model/form/application.xml b/administrator/components/com_config/model/form/application.xml
index e4d0e9c733c4f..2634d99ca3e8d 100644
--- a/administrator/components/com_config/model/form/application.xml
+++ b/administrator/components/com_config/model/form/application.xml
@@ -215,6 +215,7 @@
 			type="text"
 			label="COM_CONFIG_FIELD_DATABASE_HOST_LABEL"
 			description="COM_CONFIG_FIELD_DATABASE_HOST_DESC"
+			required="true"
 			filter="string"
 			size="30" />
 
@@ -223,6 +224,7 @@
 			type="text"
 			label="COM_CONFIG_FIELD_DATABASE_USERNAME_LABEL"
 			description="COM_CONFIG_FIELD_DATABASE_USERNAME_DESC"
+			required="true"
 			filter="string"
 			size="30" />
 
@@ -231,6 +233,7 @@
 			type="text"
 			label="COM_CONFIG_FIELD_DATABASE_NAME_LABEL"
 			description="COM_CONFIG_FIELD_DATABASE_NAME_DESC"
+			required="true"
 			filter="string"
 			size="30" />
 

From c17f1a2b68198188ccd7688c9a673055f6f86a0e Mon Sep 17 00:00:00 2001
From: Brian Teeman <brian@teeman.net>
Date: Thu, 12 Nov 2015 15:52:36 +0000
Subject: [PATCH 032/176] Update edit.php

---
 components/com_users/views/profile/tmpl/edit.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/com_users/views/profile/tmpl/edit.php b/components/com_users/views/profile/tmpl/edit.php
index 759cd5ffe5607..92b2ba1067aa6 100644
--- a/components/com_users/views/profile/tmpl/edit.php
+++ b/components/com_users/views/profile/tmpl/edit.php
@@ -131,7 +131,7 @@
 		<div class="control-group">
 			<div class="controls">
 				<button type="submit" class="btn btn-primary validate"><span><?php echo JText::_('JSUBMIT'); ?></span></button>
-				<a class="btn" href="<?php echo JRoute::_(''); ?>" title="<?php echo JText::_('JCANCEL'); ?>"><?php echo JText::_('JCANCEL'); ?></a>
+				<a class="btn" href="<?php echo JRoute::_('index.php?option=com_users'); ?>" title="<?php echo JText::_('JCANCEL'); ?>"><?php echo JText::_('JCANCEL'); ?></a>
 				<input type="hidden" name="option" value="com_users" />
 				<input type="hidden" name="task" value="profile.save" />
 			</div>

From 36e7e1bb0eb508f723a23369ccd5f315f10722b1 Mon Sep 17 00:00:00 2001
From: Brian Teeman <brian@teeman.net>
Date: Thu, 12 Nov 2015 16:32:57 +0000
Subject: [PATCH 033/176] Update lunk

---
 components/com_users/views/profile/tmpl/edit.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/com_users/views/profile/tmpl/edit.php b/components/com_users/views/profile/tmpl/edit.php
index 92b2ba1067aa6..ee97a9227316a 100644
--- a/components/com_users/views/profile/tmpl/edit.php
+++ b/components/com_users/views/profile/tmpl/edit.php
@@ -131,7 +131,7 @@
 		<div class="control-group">
 			<div class="controls">
 				<button type="submit" class="btn btn-primary validate"><span><?php echo JText::_('JSUBMIT'); ?></span></button>
-				<a class="btn" href="<?php echo JRoute::_('index.php?option=com_users'); ?>" title="<?php echo JText::_('JCANCEL'); ?>"><?php echo JText::_('JCANCEL'); ?></a>
+				<a class="btn" href="<?php echo JRoute::_('index.php?option=com_users&view=profile'); ?>" title="<?php echo JText::_('JCANCEL'); ?>"><?php echo JText::_('JCANCEL'); ?></a>
 				<input type="hidden" name="option" value="com_users" />
 				<input type="hidden" name="task" value="profile.save" />
 			</div>

From 611ab247e113877c7974afa5ca9d578c73695cc8 Mon Sep 17 00:00:00 2001
From: Michael Babker <mbabker@flbab.com>
Date: Thu, 12 Nov 2015 09:41:21 -0500
Subject: [PATCH 034/176] Pull in Symfony's PHP 5.6 polyfill to consistently
 use hash_equals

---
 .gitignore                                    |   5 +
 composer.json                                 |   1 +
 composer.lock                                 | 112 +++++++++++++-
 libraries/joomla/crypt/crypt.php              |  27 +---
 libraries/vendor/composer/autoload_files.php  |   1 +
 libraries/vendor/composer/autoload_psr4.php   |   2 +
 libraries/vendor/composer/installed.json      | 112 ++++++++++++++
 .../vendor/symfony/polyfill-php56/LICENSE     |  19 +++
 .../vendor/symfony/polyfill-php56/Php56.php   | 138 ++++++++++++++++++
 .../symfony/polyfill-php56/bootstrap.php      |  24 +++
 .../vendor/symfony/polyfill-util/Binary.php   |  18 +++
 .../polyfill-util/BinaryNoFuncOverload.php    |  65 +++++++++
 .../polyfill-util/BinaryOnFuncOverload.php    |  67 +++++++++
 .../vendor/symfony/polyfill-util/LICENSE      |  19 +++
 14 files changed, 583 insertions(+), 27 deletions(-)
 create mode 100644 libraries/vendor/symfony/polyfill-php56/LICENSE
 create mode 100644 libraries/vendor/symfony/polyfill-php56/Php56.php
 create mode 100644 libraries/vendor/symfony/polyfill-php56/bootstrap.php
 create mode 100644 libraries/vendor/symfony/polyfill-util/Binary.php
 create mode 100644 libraries/vendor/symfony/polyfill-util/BinaryNoFuncOverload.php
 create mode 100644 libraries/vendor/symfony/polyfill-util/BinaryOnFuncOverload.php
 create mode 100644 libraries/vendor/symfony/polyfill-util/LICENSE

diff --git a/.gitignore b/.gitignore
index 05ff3c837a12a..d6e79cd498759 100644
--- a/.gitignore
+++ b/.gitignore
@@ -110,6 +110,11 @@ Desktop.ini
 /libraries/vendor/psr/log/.gitignore
 /libraries/vendor/psr/log/composer.json
 /libraries/vendor/psr/log/README.md
+/libraries/vendor/symfony/polyfill-php56/composer.json
+/libraries/vendor/symfony/polyfill-php56/README.md
+/libraries/vendor/symfony/polyfill-util/composer.json
+/libraries/vendor/symfony/polyfill-util/README.md
+/libraries/vendor/symfony/polyfill-util/TestListener.php
 /libraries/vendor/symfony/yaml/Tests
 /libraries/vendor/symfony/yaml/.gitignore
 /libraries/vendor/symfony/yaml/CHANGELOG.md
diff --git a/composer.json b/composer.json
index 9ce5b8404fabc..b0ba2e5eb802d 100644
--- a/composer.json
+++ b/composer.json
@@ -22,6 +22,7 @@
         "leafo/lessphp": "0.3.9",
         "paragonie/random_compat": "~1.0",
         "phpmailer/phpmailer": "5.2.9",
+        "symfony/polyfill-php56": "~1.0",
         "symfony/yaml": "2.*"
     },
     "require-dev": {
diff --git a/composer.lock b/composer.lock
index e8cc75644b336..3931b1ce3a8a3 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,8 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "c197264a007954a2f516b254701041d1",
-    "content-hash": "e9bfab93fa1da2901bef86c28a318b57",
+    "hash": "95f124c32e010ff993d660ee0c98188b",
+    "content-hash": "49979472d61e44eba9b2d42a6ab04886",
     "packages": [
         {
             "name": "ircmaxell/password-compat",
@@ -739,6 +739,114 @@
             ],
             "time": "2012-12-21 11:40:51"
         },
+        {
+            "name": "symfony/polyfill-php56",
+            "version": "v1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-php56.git",
+                "reference": "a6bd4770a6967517e6610529e14afaa3111094a3"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/a6bd4770a6967517e6610529e14afaa3111094a3",
+                "reference": "a6bd4770a6967517e6610529e14afaa3111094a3",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3",
+                "symfony/polyfill-util": "~1.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Polyfill\\Php56\\": ""
+                },
+                "files": [
+                    "bootstrap.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill backporting some PHP 5.6+ features to lower PHP versions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "time": "2015-11-04 20:28:58"
+        },
+        {
+            "name": "symfony/polyfill-util",
+            "version": "v1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-util.git",
+                "reference": "4271c55cbc0a77b2641f861b978123e46b3da969"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/4271c55cbc0a77b2641f861b978123e46b3da969",
+                "reference": "4271c55cbc0a77b2641f861b978123e46b3da969",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Polyfill\\Util\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony utilities for portability of PHP codes",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compat",
+                "compatibility",
+                "polyfill",
+                "shim"
+            ],
+            "time": "2015-11-04 20:28:58"
+        },
         {
             "name": "symfony/yaml",
             "version": "v2.7.5",
diff --git a/libraries/joomla/crypt/crypt.php b/libraries/joomla/crypt/crypt.php
index ab6e5b6ce1a4d..a60f50a3e9566 100644
--- a/libraries/joomla/crypt/crypt.php
+++ b/libraries/joomla/crypt/crypt.php
@@ -142,31 +142,8 @@ public static function genRandomBytes($length = 16)
 	 */
 	public static function timingSafeCompare($known, $unknown)
 	{
-		// Prefer PHP's hash_equals function (PHP 5.6+) if available
-		if (function_exists('hash_equals'))
-		{
-			return hash_equals((string) $known, (string) $unknown);
-		}
-
-		// Prevent issues if string length is 0
-		$known .= chr(0);
-		$unknown .= chr(0);
-
-		$knownLength = static::safeStrlen($known);
-		$unknownLength = static::safeStrlen($unknown);
-
-		// Set the result to the difference between the lengths
-		$result = $knownLength - $unknownLength;
-
-		// Note that we ALWAYS iterate over the user-supplied length to prevent leaking length info.
-		for ($i = 0; $i < $unknownLength; $i++)
-		{
-			// Using % here is a trick to prevent notices. It's safe, since if the lengths are different, $result is already non-0
-			$result |= (ord($known[$i % $knownLength]) ^ ord($unknown[$i]));
-		}
-
-		// They are only identical strings if $result is exactly 0...
-		return $result === 0;
+		// This function is native in PHP as of 5.6 and backported via the symfony/polyfill-56 library
+		return hash_equals((string) $known, (string) $unknown);
 	}
 
 	/**
diff --git a/libraries/vendor/composer/autoload_files.php b/libraries/vendor/composer/autoload_files.php
index a4db825847ef1..a896f89286bfb 100644
--- a/libraries/vendor/composer/autoload_files.php
+++ b/libraries/vendor/composer/autoload_files.php
@@ -8,4 +8,5 @@
 return array(
     $vendorDir . '/ircmaxell/password-compat/lib/password.php',
     $vendorDir . '/paragonie/random_compat/lib/random.php',
+    $vendorDir . '/symfony/polyfill-php56/bootstrap.php',
 );
diff --git a/libraries/vendor/composer/autoload_psr4.php b/libraries/vendor/composer/autoload_psr4.php
index d7cd2606c7a2d..4fd4b72648438 100644
--- a/libraries/vendor/composer/autoload_psr4.php
+++ b/libraries/vendor/composer/autoload_psr4.php
@@ -6,6 +6,8 @@
 $baseDir = dirname(dirname($vendorDir));
 
 return array(
+    'Symfony\\Polyfill\\Util\\' => array($vendorDir . '/symfony/polyfill-util'),
+    'Symfony\\Polyfill\\Php56\\' => array($vendorDir . '/symfony/polyfill-php56'),
     'Symfony\\Component\\Yaml\\' => array($vendorDir . '/symfony/yaml'),
     'Joomla\\Utilities\\Tests\\' => array($vendorDir . '/joomla/utilities/Tests'),
     'Joomla\\Utilities\\' => array($vendorDir . '/joomla/utilities/src'),
diff --git a/libraries/vendor/composer/installed.json b/libraries/vendor/composer/installed.json
index d72ed9ac375ae..88428164adc47 100644
--- a/libraries/vendor/composer/installed.json
+++ b/libraries/vendor/composer/installed.json
@@ -813,5 +813,117 @@
             "pseudorandom",
             "random"
         ]
+    },
+    {
+        "name": "symfony/polyfill-util",
+        "version": "v1.0.0",
+        "version_normalized": "1.0.0.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/symfony/polyfill-util.git",
+            "reference": "4271c55cbc0a77b2641f861b978123e46b3da969"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/4271c55cbc0a77b2641f861b978123e46b3da969",
+            "reference": "4271c55cbc0a77b2641f861b978123e46b3da969",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=5.3.3"
+        },
+        "time": "2015-11-04 20:28:58",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "1.0-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "psr-4": {
+                "Symfony\\Polyfill\\Util\\": ""
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "Nicolas Grekas",
+                "email": "p@tchwork.com"
+            },
+            {
+                "name": "Symfony Community",
+                "homepage": "https://symfony.com/contributors"
+            }
+        ],
+        "description": "Symfony utilities for portability of PHP codes",
+        "homepage": "https://symfony.com",
+        "keywords": [
+            "compat",
+            "compatibility",
+            "polyfill",
+            "shim"
+        ]
+    },
+    {
+        "name": "symfony/polyfill-php56",
+        "version": "v1.0.0",
+        "version_normalized": "1.0.0.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/symfony/polyfill-php56.git",
+            "reference": "a6bd4770a6967517e6610529e14afaa3111094a3"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/a6bd4770a6967517e6610529e14afaa3111094a3",
+            "reference": "a6bd4770a6967517e6610529e14afaa3111094a3",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=5.3.3",
+            "symfony/polyfill-util": "~1.0"
+        },
+        "time": "2015-11-04 20:28:58",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "1.0-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "psr-4": {
+                "Symfony\\Polyfill\\Php56\\": ""
+            },
+            "files": [
+                "bootstrap.php"
+            ]
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "Nicolas Grekas",
+                "email": "p@tchwork.com"
+            },
+            {
+                "name": "Symfony Community",
+                "homepage": "https://symfony.com/contributors"
+            }
+        ],
+        "description": "Symfony polyfill backporting some PHP 5.6+ features to lower PHP versions",
+        "homepage": "https://symfony.com",
+        "keywords": [
+            "compatibility",
+            "polyfill",
+            "portable",
+            "shim"
+        ]
     }
 ]
diff --git a/libraries/vendor/symfony/polyfill-php56/LICENSE b/libraries/vendor/symfony/polyfill-php56/LICENSE
new file mode 100644
index 0000000000000..ef1cde91a61c3
--- /dev/null
+++ b/libraries/vendor/symfony/polyfill-php56/LICENSE
@@ -0,0 +1,19 @@
+Copyright (c) 2014-2015 Fabien Potencier
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/libraries/vendor/symfony/polyfill-php56/Php56.php b/libraries/vendor/symfony/polyfill-php56/Php56.php
new file mode 100644
index 0000000000000..c65e03b968661
--- /dev/null
+++ b/libraries/vendor/symfony/polyfill-php56/Php56.php
@@ -0,0 +1,138 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Polyfill\Php56;
+
+use Symfony\Polyfill\Util\Binary;
+
+/**
+ * @internal
+ */
+final class Php56
+{
+    const LDAP_ESCAPE_FILTER = 1;
+    const LDAP_ESCAPE_DN = 2;
+
+    public static function hash_equals($knownString, $userInput)
+    {
+        if (!is_string($knownString)) {
+            trigger_error('Expected known_string to be a string, '.gettype($knownString).' given', E_USER_WARNING);
+
+            return false;
+        }
+
+        if (!is_string($userInput)) {
+            trigger_error('Expected user_input to be a string, '.gettype($userInput).' given', E_USER_WARNING);
+
+            return false;
+        }
+
+        $knownLen = Binary::strlen($knownString);
+        $userLen = Binary::strlen($userInput);
+
+        if ($knownLen !== $userLen) {
+            return false;
+        }
+
+        $result = 0;
+
+        for ($i = 0; $i < $knownLen; ++$i) {
+            $result |= ord($knownString[$i]) ^ ord($userInput[$i]);
+        }
+
+        return 0 === $result;
+    }
+
+    /**
+     * Stub implementation of the {@link ldap_escape()} function of the ldap
+     * extension.
+     *
+     * Escape strings for safe use in LDAP filters and DNs.
+     *
+     * @author Chris Wright <ldapi@daverandom.com>
+     *
+     * @param string $subject
+     * @param string $ignore
+     * @param int    $flags
+     *
+     * @return string
+     *
+     * @see http://stackoverflow.com/a/8561604
+     */
+    public static function ldap_escape($subject, $ignore = '', $flags = 0)
+    {
+        static $charMaps = null;
+
+        if (null === $charMaps) {
+            $charMaps = array(
+                self::LDAP_ESCAPE_FILTER => array('\\', '*', '(', ')', "\x00"),
+                self::LDAP_ESCAPE_DN => array('\\', ',', '=', '+', '<', '>', ';', '"', '#'),
+            );
+
+            $charMaps[0] = array();
+
+            for ($i = 0; $i < 256; ++$i) {
+                $charMaps[0][chr($i)] = sprintf('\\%02x', $i);
+            }
+
+            for ($i = 0, $l = count($charMaps[self::LDAP_ESCAPE_FILTER]); $i < $l; ++$i) {
+                $chr = $charMaps[self::LDAP_ESCAPE_FILTER][$i];
+                unset($charMaps[self::LDAP_ESCAPE_FILTER][$i]);
+                $charMaps[self::LDAP_ESCAPE_FILTER][$chr] = $charMaps[0][$chr];
+            }
+
+            for ($i = 0, $l = count($charMaps[self::LDAP_ESCAPE_DN]); $i < $l; ++$i) {
+                $chr = $charMaps[self::LDAP_ESCAPE_DN][$i];
+                unset($charMaps[self::LDAP_ESCAPE_DN][$i]);
+                $charMaps[self::LDAP_ESCAPE_DN][$chr] = $charMaps[0][$chr];
+            }
+        }
+
+        // Create the base char map to escape
+        $flags = (int) $flags;
+        $charMap = array();
+
+        if ($flags & self::LDAP_ESCAPE_FILTER) {
+            $charMap += $charMaps[self::LDAP_ESCAPE_FILTER];
+        }
+
+        if ($flags & self::LDAP_ESCAPE_DN) {
+            $charMap += $charMaps[self::LDAP_ESCAPE_DN];
+        }
+
+        if (!$charMap) {
+            $charMap = $charMaps[0];
+        }
+
+        // Remove any chars to ignore from the list
+        $ignore = (string) $ignore;
+
+        for ($i = 0, $l = strlen($ignore); $i < $l; ++$i) {
+            unset($charMap[$ignore[$i]]);
+        }
+
+        // Do the main replacement
+        $result = strtr($subject, $charMap);
+
+        // Encode leading/trailing spaces if self::LDAP_ESCAPE_DN is passed
+        if ($flags & self::LDAP_ESCAPE_DN) {
+            if ($result[0] === ' ') {
+                $result = '\\20'.substr($result, 1);
+            }
+
+            if ($result[strlen($result) - 1] === ' ') {
+                $result = substr($result, 0, -1).'\\20';
+            }
+        }
+
+        return $result;
+    }
+}
diff --git a/libraries/vendor/symfony/polyfill-php56/bootstrap.php b/libraries/vendor/symfony/polyfill-php56/bootstrap.php
new file mode 100644
index 0000000000000..5a2121084daaa
--- /dev/null
+++ b/libraries/vendor/symfony/polyfill-php56/bootstrap.php
@@ -0,0 +1,24 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+use Symfony\Polyfill\Php56 as p;
+
+if (PHP_VERSION_ID < 50600) {
+    if (!function_exists('hash_equals')) {
+        function hash_equals($knownString, $userInput) { return p\Php56::hash_equals($knownString, $userInput); }
+    }
+    if (extension_loaded('ldap') && !function_exists('ldap_escape')) {
+        define('LDAP_ESCAPE_FILTER', 1);
+        define('LDAP_ESCAPE_DN', 2);
+
+        function ldap_escape($subject, $ignore = '', $flags = 0) { return p\Php56::ldap_escape($subject, $ignore, $flags); }
+    }
+}
diff --git a/libraries/vendor/symfony/polyfill-util/Binary.php b/libraries/vendor/symfony/polyfill-util/Binary.php
new file mode 100644
index 0000000000000..815bc750cbd4e
--- /dev/null
+++ b/libraries/vendor/symfony/polyfill-util/Binary.php
@@ -0,0 +1,18 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Polyfill\Util;
+
+if (extension_loaded('mbstring')) {
+    class Binary extends BinaryOnFuncOverload {}
+} else {
+    class Binary extends BinaryNoFuncOverload {}
+}
diff --git a/libraries/vendor/symfony/polyfill-util/BinaryNoFuncOverload.php b/libraries/vendor/symfony/polyfill-util/BinaryNoFuncOverload.php
new file mode 100644
index 0000000000000..5ef3c6c2c22c2
--- /dev/null
+++ b/libraries/vendor/symfony/polyfill-util/BinaryNoFuncOverload.php
@@ -0,0 +1,65 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Polyfill\Util;
+
+/**
+ * @author Nicolas Grekas <p@tchwork.com>
+ *
+ * @internal
+ */
+class BinaryNoFuncOverload
+{
+    public static function strlen($s)
+    {
+        return strlen($s);
+    }
+
+    public static function strpos($haystack, $needle, $offset = 0)
+    {
+        return strpos($haystack, $needle, $offset);
+    }
+
+    public static function strrpos($haystack, $needle, $offset = 0)
+    {
+        return strrpos($haystack, $needle, $offset);
+    }
+
+    public static function substr($string, $start, $length = PHP_INT_MAX)
+    {
+        return substr($string, $start, $length);
+    }
+
+    public static function stripos($s, $needle, $offset = 0)
+    {
+        return stripos($s, $needle, $offset);
+    }
+
+    public static function stristr($s, $needle, $part = false)
+    {
+        return stristr($s, $needle, $part);
+    }
+
+    public static function strrchr($s, $needle, $part = false)
+    {
+        return strrchr($s, $needle, $part);
+    }
+
+    public static function strripos($s, $needle, $offset = 0)
+    {
+        return strripos($s, $needle, $offset);
+    }
+
+    public static function strstr($s, $needle, $part = false)
+    {
+        return strstr($s, $needle, $part);
+    }
+}
diff --git a/libraries/vendor/symfony/polyfill-util/BinaryOnFuncOverload.php b/libraries/vendor/symfony/polyfill-util/BinaryOnFuncOverload.php
new file mode 100644
index 0000000000000..e1b886eaca348
--- /dev/null
+++ b/libraries/vendor/symfony/polyfill-util/BinaryOnFuncOverload.php
@@ -0,0 +1,67 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Polyfill\Util;
+
+/**
+ * Binary safe version of string functions overloaded when MB_OVERLOAD_STRING is enabled.
+ *
+ * @author Nicolas Grekas <p@tchwork.com>
+ *
+ * @internal
+ */
+class BinaryOnFuncOverload
+{
+    public static function strlen($s)
+    {
+        return mb_strlen($s, '8bit');
+    }
+
+    public static function strpos($haystack, $needle, $offset = 0)
+    {
+        return mb_strpos($haystack, $needle, $offset, '8bit');
+    }
+
+    public static function strrpos($haystack, $needle, $offset = 0)
+    {
+        return mb_strrpos($haystack, $needle, $offset, '8bit');
+    }
+
+    public static function substr($string, $start, $length = 2147483647)
+    {
+        return mb_substr($string, $start, $length, '8bit');
+    }
+
+    public static function stripos($s, $needle, $offset = 0)
+    {
+        return mb_stripos($s, $needle, $offset, '8bit');
+    }
+
+    public static function stristr($s, $needle, $part = false)
+    {
+        return mb_stristr($s, $needle, $part, '8bit');
+    }
+
+    public static function strrchr($s, $needle, $part = false)
+    {
+        return mb_strrchr($s, $needle, $part, '8bit');
+    }
+
+    public static function strripos($s, $needle, $offset = 0)
+    {
+        return mb_strripos($s, $needle, $offset, '8bit');
+    }
+
+    public static function strstr($s, $needle, $part = false)
+    {
+        return mb_strstr($s, $needle, $part, '8bit');
+    }
+}
diff --git a/libraries/vendor/symfony/polyfill-util/LICENSE b/libraries/vendor/symfony/polyfill-util/LICENSE
new file mode 100644
index 0000000000000..ef1cde91a61c3
--- /dev/null
+++ b/libraries/vendor/symfony/polyfill-util/LICENSE
@@ -0,0 +1,19 @@
+Copyright (c) 2014-2015 Fabien Potencier
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

From 75c257d00cff4893f8233fad8bbd4087093fcc0c Mon Sep 17 00:00:00 2001
From: Jelle Kok <schumacher1986@hotmail.com>
Date: Thu, 12 Nov 2015 19:01:28 +0100
Subject: [PATCH 035/176] Typo: Batch item

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

diff --git a/layouts/joomla/html/batch/item.php b/layouts/joomla/html/batch/item.php
index 5947333853093..8fe16c58e9cb8 100644
--- a/layouts/joomla/html/batch/item.php
+++ b/layouts/joomla/html/batch/item.php
@@ -31,7 +31,7 @@
 		<?php echo JHtml::_('select.options', JHtml::_('category.options', $extension)); ?>
 	</select>
 </div>
-<div id="batch-copy-move" class="control-group radio">'
+<div id="batch-copy-move" class="control-group radio">
 	<?php echo JText::_('JLIB_HTML_BATCH_MOVE_QUESTION'); ?>
 	<?php echo JHtml::_('select.radiolist', $options, 'batch[move_copy]', '', 'value', 'text', 'm'); ?>
 </div>

From 5608010b2ce07dd123d016609ce1868c67de908b Mon Sep 17 00:00:00 2001
From: Nicola Galgano <extensions4joomla@gmail.com>
Date: Thu, 12 Nov 2015 19:29:27 +0100
Subject: [PATCH 036/176] Debug console not working showing explain

see #8362
---
 plugins/system/debug/debug.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/system/debug/debug.php b/plugins/system/debug/debug.php
index 5e0ddbf0347a2..314bd4d7e480b 100644
--- a/plugins/system/debug/debug.php
+++ b/plugins/system/debug/debug.php
@@ -154,6 +154,7 @@ public function __construct(&$subject, $config)
 		// Prepare disconnect handler for SQL profiling.
 		$db = JFactory::getDbo();
 		$db->addDisconnectHandler(array($this, 'mysqlDisconnectHandler'));
+		$db->disconnect();
 	}
 
 	/**

From 2d9ebefcf2b4186e088bf146cec181fe1fc4a711 Mon Sep 17 00:00:00 2001
From: Nicola Galgano <extensions4joomla@gmail.com>
Date: Thu, 12 Nov 2015 19:52:34 +0100
Subject: [PATCH 037/176] ops

ops..
---
 plugins/system/debug/debug.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/system/debug/debug.php b/plugins/system/debug/debug.php
index 314bd4d7e480b..703f340db4e03 100644
--- a/plugins/system/debug/debug.php
+++ b/plugins/system/debug/debug.php
@@ -154,7 +154,6 @@ public function __construct(&$subject, $config)
 		// Prepare disconnect handler for SQL profiling.
 		$db = JFactory::getDbo();
 		$db->addDisconnectHandler(array($this, 'mysqlDisconnectHandler'));
-		$db->disconnect();
 	}
 
 	/**
@@ -654,6 +653,7 @@ protected function displayProfileInformation()
 			}
 		}
 
+		$db->disconnect();
 		return implode('', $html);
 	}
 

From 78232f28d7dc59ee0057c9f55531d9d95f9feed6 Mon Sep 17 00:00:00 2001
From: Michael Babker <mbabker@flbab.com>
Date: Thu, 12 Nov 2015 09:21:59 -0500
Subject: [PATCH 038/176] Beef up JCryptPasswordSimple to match JUserHelper

---
 libraries/joomla/crypt/password/simple.php | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/libraries/joomla/crypt/password/simple.php b/libraries/joomla/crypt/password/simple.php
index 2e104a9d0dab3..71750ef940a93 100644
--- a/libraries/joomla/crypt/password/simple.php
+++ b/libraries/joomla/crypt/password/simple.php
@@ -141,21 +141,27 @@ public function verify($password, $hash)
 				$type = '$2y$';
 			}
 
-			$hash = $type . substr($hash, 4);
-
-			return (crypt($password, $hash) === $hash);
+			return password_verify($password, $hash);
 		}
 
 		// Check if the hash is an MD5 hash.
 		if (substr($hash, 0, 3) == '$1$')
 		{
-			return (crypt($password, $hash) === $hash);
+			return JCrypt::timingSafeCompare(crypt($password, $hash), $hash);
 		}
 
 		// Check if the hash is a Joomla hash.
 		if (preg_match('#[a-z0-9]{32}:[A-Za-z0-9]{32}#', $hash) === 1)
 		{
-			return md5($password . substr($hash, 33)) === substr($hash, 0, 32);
+			// Check the password
+			$parts = explode(':', $hash);
+			$salt  = @$parts[1];
+
+			// Compile the hash to compare
+			// If the salt is empty AND there is a ':' in the original hash, we must append ':' at the end
+			$testcrypt = md5($password . $salt) . ($salt ? ':' . $salt : (strpos($hash, ':') !== false ? ':' : ''));
+
+			return JCrypt::timingSafeCompare($hash, $testcrypt);
 		}
 
 		return false;

From 0f274fe53b40a2a384dc862b0b69774012888cba Mon Sep 17 00:00:00 2001
From: Nicola Galgano <extensions4joomla@gmail.com>
Date: Thu, 12 Nov 2015 20:38:55 +0100
Subject: [PATCH 039/176] better place

added a comment not so sure is understandable
---
 plugins/system/debug/debug.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/system/debug/debug.php b/plugins/system/debug/debug.php
index 703f340db4e03..3e4ec7090c69b 100644
--- a/plugins/system/debug/debug.php
+++ b/plugins/system/debug/debug.php
@@ -602,6 +602,8 @@ protected function displayProfileInformation()
 		$html[] = '<div class="dbg-profile-list">' . implode('', $htmlMarks) . '</div>';
 
 		$db = JFactory::getDbo();
+		//  fix  for support custom shutdown function via register_shutdown_function().
+		$db->disconnect();
 
 		$log = $db->getLog();
 
@@ -653,7 +655,6 @@ protected function displayProfileInformation()
 			}
 		}
 
-		$db->disconnect();
 		return implode('', $html);
 	}
 

From b28971465ddd5907e14954e9e44c7d8aebc457b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nils=20R=C3=BCckmann?= <nils@rueckmann.com>
Date: Thu, 12 Nov 2015 22:19:54 +0100
Subject: [PATCH 040/176] avoid sending data to blocked users

---
 plugins/content/joomla/joomla.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/content/joomla/joomla.php b/plugins/content/joomla/joomla.php
index 44f5b584379ae..30a08b8f8dee1 100644
--- a/plugins/content/joomla/joomla.php
+++ b/plugins/content/joomla/joomla.php
@@ -54,7 +54,8 @@ public function onContentAfterSave($context, $article, $isNew)
 		$query = $db->getQuery(true)
 			->select($db->quoteName('id'))
 			->from($db->quoteName('#__users'))
-			->where($db->quoteName('sendEmail') . ' = 1');
+			->where($db->quoteName('sendEmail') . ' = 1')
+			->where($db->quoteName('block') . ' = 0');
 		$db->setQuery($query);
 		$users = (array) $db->loadColumn();
 

From 2c6073e3deef3363127ed7a04abfafc7eb77ae0f Mon Sep 17 00:00:00 2001
From: Scott <scott@paragonie.com>
Date: Thu, 12 Nov 2015 16:32:53 -0500
Subject: [PATCH 041/176] Use defuse/php-encryption v1.1 (which wasn't
 available through Composer)

---
 libraries/defuse/php-encryption/.travis.yml   |  15 +
 libraries/defuse/php-encryption/Crypto.php    | 676 ++++++++++++++++++
 libraries/defuse/php-encryption/README.md     |  79 ++
 libraries/defuse/php-encryption/benchmark.php |  42 ++
 libraries/defuse/php-encryption/example.php   |  36 +
 libraries/defuse/php-encryption/test.sh       |  30 +
 .../defuse/php-encryption/tests/runtime.php   |  32 +
 libraries/import.php                          |   3 +
 8 files changed, 913 insertions(+)
 create mode 100644 libraries/defuse/php-encryption/.travis.yml
 create mode 100644 libraries/defuse/php-encryption/Crypto.php
 create mode 100644 libraries/defuse/php-encryption/README.md
 create mode 100644 libraries/defuse/php-encryption/benchmark.php
 create mode 100644 libraries/defuse/php-encryption/example.php
 create mode 100644 libraries/defuse/php-encryption/test.sh
 create mode 100644 libraries/defuse/php-encryption/tests/runtime.php

diff --git a/libraries/defuse/php-encryption/.travis.yml b/libraries/defuse/php-encryption/.travis.yml
new file mode 100644
index 0000000000000..8729b669429fd
--- /dev/null
+++ b/libraries/defuse/php-encryption/.travis.yml
@@ -0,0 +1,15 @@
+language: php
+php:
+    - "5.5"
+    - "5.4"
+    - "5.3"
+    - "5.2"
+# Versions below here are not installed on travis-ci
+#    - "5.1"
+#    - "5.0"
+#    - "4.4"
+#    - "4.3"
+#    - "4.2"
+#    - "4.1"
+#    - "4.0"
+script: ./test.sh
diff --git a/libraries/defuse/php-encryption/Crypto.php b/libraries/defuse/php-encryption/Crypto.php
new file mode 100644
index 0000000000000..1d7586f485bc1
--- /dev/null
+++ b/libraries/defuse/php-encryption/Crypto.php
@@ -0,0 +1,676 @@
+<?php
+
+/*
+ * PHP Encryption Library
+ * Copyright (c) 2014, Taylor Hornby
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, 
+ * this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation 
+ * and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE 
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*
+ * Web: https://defuse.ca/secure-php-encryption.htm
+ * GitHub: https://github.com/defuse/php-encryption 
+ *
+ * WARNING: This encryption library is not a silver bullet. It only provides
+ * symmetric encryption given a uniformly random key. This means you MUST NOT
+ * use an ASCII string like a password as the key parameter, it MUST be
+ * a uniformly random key generated by CreateNewRandomKey(). If you want to
+ * encrypt something with a password, apply a password key derivation function
+ * like PBKDF2 or scrypt with a random salt to generate a key.
+ *
+ * WARNING: Error handling is very important, especially for crypto code! 
+ *
+ * How to use this code:
+ *
+ *     Generating a Key
+ *     ----------------
+ *       try {
+ *           $key = Crypto::CreateNewRandomKey();
+ *           // WARNING: Do NOT encode $key with bin2hex() or base64_encode(),
+ *           // they may leak the key to the attacker through side channels.
+ *       } catch (CryptoTestFailedException $ex) {
+ *           die('Cannot safely create a key');
+ *       } catch (CannotPerformOperationException $ex) {
+ *           die('Cannot safely create a key');
+ *       }
+ *
+ *     Encrypting a Message
+ *     --------------------
+ *       $message = "ATTACK AT DAWN";
+ *       try {
+ *           $ciphertext = Crypto::Encrypt($message, $key);
+ *       } catch (CryptoTestFailedException $ex) {
+ *           die('Cannot safely perform encryption');
+ *       } catch (CannotPerformOperationException $ex) {
+ *           die('Cannot safely perform decryption');
+ *       }
+ *
+ *     Decrypting a Message
+ *     --------------------
+ *       try {
+ *           $decrypted = Crypto::Decrypt($ciphertext, $key);
+ *       } catch (InvalidCiphertextException $ex) { // VERY IMPORTANT
+ *           // Either:
+ *           //   1. The ciphertext was modified by the attacker,
+ *           //   2. The key is wrong, or
+ *           //   3. $ciphertext is not a valid ciphertext or was corrupted.
+ *           // Assume the worst.
+ *           die('DANGER! DANGER! The ciphertext has been tampered with!');
+ *       } catch (CryptoTestFailedException $ex) {
+ *           die('Cannot safely perform encryption');
+ *       } catch (CannotPerformOperationException $ex) {
+ *           die('Cannot safely perform decryption');
+ *       }
+ */
+
+/* 
+ * Raised by Decrypt() when one of the following conditions are met:
+ *  - The key is wrong.
+ *  - The ciphertext is invalid or not in the correct format.
+ *  - The attacker modified the ciphertext.
+ */
+class InvalidCiphertextException extends Exception {}
+/* If you see these, it means it is NOT SAFE to do encryption on your system. */
+class CannotPerformOperationException extends Exception {}
+class CryptoTestFailedException extends Exception {}
+
+class Crypto
+{
+    // Ciphertext format: [____HMAC____][____IV____][____CIPHERTEXT____].
+
+    /* Do not change these constants! */
+    const CIPHER = MCRYPT_RIJNDAEL_128;
+    const KEY_BYTE_SIZE = 16;
+    const CIPHER_MODE = 'cbc';
+    const HASH_FUNCTION = 'sha256';
+    const MAC_BYTE_SIZE = 32;
+    const ENCRYPTION_INFO = 'DefusePHP|KeyForEncryption';
+    const AUTHENTICATION_INFO = 'DefusePHP|KeyForAuthentication';
+
+    /*
+     * Use this to generate a random encryption key.
+     */
+    public static function CreateNewRandomKey()
+    {
+        Crypto::RuntimeTest();
+        return self::SecureRandom(self::KEY_BYTE_SIZE);
+    }
+
+    /*
+     * Encrypts a message.
+     * $plaintext is the message to encrypt.
+     * $key is the encryption key, a value generated by CreateNewRandomKey().
+     * You MUST catch exceptions thrown by this function. See docs above.
+     */
+    public static function Encrypt($plaintext, $key)
+    {
+        Crypto::RuntimeTest();
+
+        if (self::our_strlen($key) !== self::KEY_BYTE_SIZE)
+        {
+            throw new CannotPerformOperationException("Bad key.");
+        }
+
+        // Generate a sub-key for encryption.
+        $keysize = self::KEY_BYTE_SIZE;
+        $ekey = self::HKDF(self::HASH_FUNCTION, $key, $keysize, self::ENCRYPTION_INFO);
+
+        // Generate a random initialization vector.
+        self::EnsureFunctionExists("mcrypt_get_iv_size");
+        $ivsize = mcrypt_get_iv_size(self::CIPHER, self::CIPHER_MODE);
+        if ($ivsize === FALSE || $ivsize <= 0) {
+            throw new CannotPerformOperationException();
+        }
+        $iv = self::SecureRandom($ivsize);
+
+        $ciphertext = $iv . self::PlainEncrypt($plaintext, $ekey, $iv);
+
+        // Generate a sub-key for authentication and apply the HMAC.
+        $akey = self::HKDF(self::HASH_FUNCTION, $key, self::KEY_BYTE_SIZE, self::AUTHENTICATION_INFO);
+        $auth = hash_hmac(self::HASH_FUNCTION, $ciphertext, $akey, true);
+        $ciphertext = $auth . $ciphertext;
+
+        return $ciphertext;
+    }
+
+    /*
+     * Decrypts a ciphertext.
+     * $ciphertext is the ciphertext to decrypt.
+     * $key is the key that the ciphertext was encrypted with.
+     * You MUST catch exceptions thrown by this function. See docs above.
+     */
+    public static function Decrypt($ciphertext, $key)
+    {
+        Crypto::RuntimeTest();
+
+        // Extract the HMAC from the front of the ciphertext.
+        if (self::our_strlen($ciphertext) <= self::MAC_BYTE_SIZE) {
+            throw new InvalidCiphertextException();
+        }
+        $hmac = self::our_substr($ciphertext, 0, self::MAC_BYTE_SIZE);
+        if ($hmac === FALSE) {
+            throw new CannotPerformOperationException();
+        }
+        $ciphertext = self::our_substr($ciphertext, self::MAC_BYTE_SIZE);
+        if ($ciphertext === FALSE) {
+            throw new CannotPerformOperationException();
+        }
+
+        // Regenerate the same authentication sub-key.
+        $akey = self::HKDF(self::HASH_FUNCTION, $key, self::KEY_BYTE_SIZE, self::AUTHENTICATION_INFO);
+
+        if (self::VerifyHMAC($hmac, $ciphertext, $akey))
+        {
+            // Regenerate the same encryption sub-key.
+            $keysize = self::KEY_BYTE_SIZE;
+            $ekey = self::HKDF(self::HASH_FUNCTION, $key, $keysize, self::ENCRYPTION_INFO);
+
+            // Extract the initialization vector from the ciphertext.
+            self::EnsureFunctionExists("mcrypt_get_iv_size");
+            $ivsize = mcrypt_get_iv_size(self::CIPHER, self::CIPHER_MODE);
+            if ($ivsize === FALSE || $ivsize <= 0) {
+                throw new CannotPerformOperationException();
+            }
+            if (self::our_strlen($ciphertext) <= $ivsize) {
+                throw new InvalidCiphertextException();
+            }
+            $iv = self::our_substr($ciphertext, 0, $ivsize);
+            if ($iv === FALSE) {
+                throw new CannotPerformOperationException();
+            }
+            $ciphertext = self::our_substr($ciphertext, $ivsize);
+            if ($ciphertext === FALSE) {
+                throw new CannotPerformOperationException();
+            }
+            
+            $plaintext = self::PlainDecrypt($ciphertext, $ekey, $iv);
+
+            return $plaintext;
+        }
+        else
+        {
+            /*
+             * We throw an exception instead of returning FALSE because we want
+             * a script that doesn't handle this condition to CRASH, instead
+             * of thinking the ciphertext decrypted to the value FALSE.
+             */
+             throw new InvalidCiphertextException();
+        }
+    }
+
+    /*
+     * Runs tests.
+     * Raises CannotPerformOperationException or CryptoTestFailedException if
+     * one of the tests fail. If any tests fails, your system is not capable of
+     * performing encryption, so make sure you fail safe in that case.
+     */
+    public static function RuntimeTest()
+    {
+        // 0: Tests haven't been run yet.
+        // 1: Tests have passed.
+        // 2: Tests are running right now.
+        // 3: Tests have failed.
+        static $test_state = 0;
+
+        if ($test_state === 1 || $test_state === 2) {
+            return;
+        }
+
+        try {
+            $test_state = 2;
+            self::AESTestVector();
+            self::HMACTestVector();
+            self::HKDFTestVector();
+
+            self::TestEncryptDecrypt();
+            if (self::our_strlen(Crypto::CreateNewRandomKey()) != self::KEY_BYTE_SIZE) {
+                throw new CryptoTestFailedException();
+            }
+
+            if (self::ENCRYPTION_INFO == self::AUTHENTICATION_INFO) {
+                throw new CryptoTestFailedException();
+            }
+        } catch (CryptoTestFailedException $ex) {
+            // Do this, otherwise it will stay in the "tests are running" state.
+            $test_state = 3;
+            throw $ex;
+        }
+
+        // Change this to '0' make the tests always re-run (for benchmarking).
+        $test_state = 1;
+    }
+
+    /*
+     * Never call this method directly!
+     */
+    private static function PlainEncrypt($plaintext, $key, $iv)
+    {
+        self::EnsureFunctionExists("mcrypt_module_open");
+        $crypt = mcrypt_module_open(self::CIPHER, "", self::CIPHER_MODE, "");
+        if ($crypt === FALSE) {
+            throw new CannotPerformOperationException();
+        }
+
+        // Pad the plaintext to a multiple of the block size.
+        self::EnsureFunctionExists("mcrypt_enc_get_block_size");
+        $block = mcrypt_enc_get_block_size($crypt);
+        $pad = $block - (self::our_strlen($plaintext) % $block);
+        $plaintext .= str_repeat(chr($pad), $pad);
+
+        self::EnsureFunctionExists("mcrypt_generic_init");
+        $ret = mcrypt_generic_init($crypt, $key, $iv);
+        if ($ret !== 0) {
+            throw new CannotPerformOperationException();
+        }
+        self::EnsureFunctionExists("mcrypt_generic");
+        $ciphertext = mcrypt_generic($crypt, $plaintext);
+        self::EnsureFunctionExists("mcrypt_generic_deinit");
+        $ret = mcrypt_generic_deinit($crypt);
+        if ($ret !== TRUE) {
+            throw new CannotPerformOperationException();
+        }
+        self::EnsureFunctionExists("mcrypt_module_close");
+        $ret = mcrypt_module_close($crypt);
+        if ($ret !== TRUE) {
+            throw new CannotPerformOperationException();
+        }
+
+        return $ciphertext;
+    }
+
+    /*
+     * Never call this method directly!
+     */
+    private static function PlainDecrypt($ciphertext, $key, $iv)
+    {
+        self::EnsureFunctionExists("mcrypt_module_open");
+        $crypt = mcrypt_module_open(self::CIPHER, "", self::CIPHER_MODE, "");
+        if ($crypt === FALSE) {
+            throw new CannotPerformOperationException();
+        }
+
+        self::EnsureFunctionExists("mcrypt_enc_get_block_size");
+        $block = mcrypt_enc_get_block_size($crypt);
+        self::EnsureFunctionExists("mcrypt_generic_init");
+        $ret = mcrypt_generic_init($crypt, $key, $iv);
+        if ($ret !== 0) {
+            throw new CannotPerformOperationException();
+        }
+        self::EnsureFunctionExists("mdecrypt_generic");
+        $plaintext = mdecrypt_generic($crypt, $ciphertext);
+        self::EnsureFunctionExists("mcrypt_generic_deinit");
+        $ret = mcrypt_generic_deinit($crypt);
+        if ($ret !== TRUE) {
+            throw new CannotPerformOperationException();
+        }
+        self::EnsureFunctionExists("mcrypt_module_close");
+        $ret = mcrypt_module_close($crypt);
+        if ($ret !== TRUE) {
+            throw new CannotPerformOperationException();
+        }
+
+        // Remove the padding.
+        $pad = ord($plaintext[self::our_strlen($plaintext) - 1]);
+        if ($pad <= 0 || $pad > $block) {
+            throw new CannotPerformOperationException();
+        }
+        $plaintext = self::our_substr($plaintext, 0, self::our_strlen($plaintext) - $pad);
+        if ($plaintext === FALSE) {
+            throw new CannotPerformOperationException();
+        }
+
+        return $plaintext;
+    }
+
+    /*
+     * Returns a random binary string of length $octets bytes.
+     */
+    private static function SecureRandom($octets)
+    {
+        self::EnsureFunctionExists("mcrypt_create_iv");
+        $random = mcrypt_create_iv($octets, MCRYPT_DEV_URANDOM);
+        if ($random === FALSE) {
+            throw new CannotPerformOperationException();
+        } else {
+            return $random;
+        }
+    }
+
+    /*
+     * Use HKDF to derive multiple keys from one.
+     * http://tools.ietf.org/html/rfc5869
+     */
+    private static function HKDF($hash, $ikm, $length, $info = '', $salt = NULL)
+    {
+        // Find the correct digest length as quickly as we can.
+        $digest_length = self::MAC_BYTE_SIZE;
+        if ($hash != self::HASH_FUNCTION) {
+            $digest_length = self::our_strlen(hash_hmac($hash, '', '', true));
+        }
+
+        // Sanity-check the desired output length.
+        if (empty($length) || !is_int($length) ||
+            $length < 0 || $length > 255 * $digest_length) {
+            throw new CannotPerformOperationException();
+        }
+
+        // "if [salt] not provided, is set to a string of HashLen zeroes."
+        if (is_null($salt)) {
+            $salt = str_repeat("\x00", $digest_length);
+        }
+
+        // HKDF-Extract:
+        // PRK = HMAC-Hash(salt, IKM)
+        // The salt is the HMAC key.
+        $prk = hash_hmac($hash, $ikm, $salt, true);
+
+        // HKDF-Expand:
+
+        // This check is useless, but it serves as a reminder to the spec.
+        if (self::our_strlen($prk) < $digest_length) {
+            throw new CannotPerformOperationException();
+        }
+
+        // T(0) = ''
+        $t = '';
+        $last_block = '';
+        for ($block_index = 1; self::our_strlen($t) < $length; $block_index++) {
+            // T(i) = HMAC-Hash(PRK, T(i-1) | info | 0x??)
+            $last_block = hash_hmac(
+                $hash,
+                $last_block . $info . chr($block_index),
+                $prk,
+                true
+            );
+            // T = T(1) | T(2) | T(3) | ... | T(N)
+            $t .= $last_block;
+        }
+
+        // ORM = first L octets of T
+        $orm = self::our_substr($t, 0, $length);
+        if ($orm === FALSE) {
+            throw new CannotPerformOperationException();
+        }
+        return $orm;
+    }
+
+    private static function VerifyHMAC($correct_hmac, $message, $key)
+    {
+        $message_hmac = hash_hmac(self::HASH_FUNCTION, $message, $key, true);
+
+        // We can't just compare the strings with '==', since it would make
+        // timing attacks possible. We could use the XOR-OR constant-time
+        // comparison algorithm, but I'm not sure if that's good enough way up
+        // here in an interpreted language. So we use the method of HMACing the 
+        // strings we want to compare with a random key, then comparing those.
+
+        // NOTE: This leaks information when the strings are not the same
+        // length, but they should always be the same length here. Enforce it:
+        if (self::our_strlen($correct_hmac) !== self::our_strlen($message_hmac)) {
+            throw new CannotPerformOperationException();
+        }
+
+        $blind = self::CreateNewRandomKey();
+        $message_compare = hash_hmac(self::HASH_FUNCTION, $message_hmac, $blind);
+        $correct_compare = hash_hmac(self::HASH_FUNCTION, $correct_hmac, $blind);
+        return $correct_compare === $message_compare;
+    }
+
+    private static function TestEncryptDecrypt()
+    {
+        $key = Crypto::CreateNewRandomKey();
+        $data = "EnCrYpT EvErYThInG\x00\x00";
+
+        // Make sure encrypting then decrypting doesn't change the message.
+        $ciphertext = Crypto::Encrypt($data, $key);
+        try {
+            $decrypted = Crypto::Decrypt($ciphertext, $key);
+        } catch (InvalidCiphertextException $ex) {
+            // It's important to catch this and change it into a 
+            // CryptoTestFailedException, otherwise a test failure could trick
+            // the user into thinking it's just an invalid ciphertext!
+            throw new CryptoTestFailedException();
+        }
+        if($decrypted !== $data)
+        {
+            throw new CryptoTestFailedException();
+        }
+
+        // Modifying the ciphertext: Appending a string.
+        try {
+            Crypto::Decrypt($ciphertext . "a", $key);
+            throw new CryptoTestFailedException();
+        } catch (InvalidCiphertextException $e) { /* expected */ }
+
+        // Modifying the ciphertext: Changing an IV byte.
+        try {
+            $ciphertext[0] = chr((ord($ciphertext[0]) + 1) % 256);
+            Crypto::Decrypt($ciphertext, $key);
+            throw new CryptoTestFailedException();
+        } catch (InvalidCiphertextException $e) { /* expected */ }
+
+        // Decrypting with the wrong key.
+        $key = Crypto::CreateNewRandomKey();
+        $data = "abcdef";
+        $ciphertext = Crypto::Encrypt($data, $key);
+        $wrong_key = Crypto::CreateNewRandomKey();
+        try {
+            Crypto::Decrypt($ciphertext, $wrong_key);
+            throw new CryptoTestFailedException();
+        } catch (InvalidCiphertextException $e) { /* expected */ }
+
+        // Ciphertext too small (shorter than HMAC).
+        $key = Crypto::CreateNewRandomKey();
+        $ciphertext = str_repeat("A", self::MAC_BYTE_SIZE - 1);
+        try {
+            Crypto::Decrypt($ciphertext, $key);
+            throw new CryptoTestFailedException();
+        } catch (InvalidCiphertextException $e) { /* expected */ }
+    }
+
+    private static function HKDFTestVector()
+    {
+        // HKDF test vectors from RFC 5869
+
+        // Test Case 1
+        $ikm = str_repeat("\x0b", 22);
+        $salt = self::hexToBytes("000102030405060708090a0b0c");
+        $info = self::hexToBytes("f0f1f2f3f4f5f6f7f8f9");
+        $length = 42;
+        $okm = self::hexToBytes(
+            "3cb25f25faacd57a90434f64d0362f2a" .
+            "2d2d0a90cf1a5a4c5db02d56ecc4c5bf" .
+            "34007208d5b887185865"
+        );
+        $computed_okm = self::HKDF("sha256", $ikm, $length, $info, $salt);
+        if ($computed_okm !== $okm) {
+            throw new CryptoTestFailedException();
+        }
+
+        // Test Case 7
+        $ikm = str_repeat("\x0c", 22);
+        $length = 42;
+        $okm = self::hexToBytes(
+            "2c91117204d745f3500d636a62f64f0a" .
+            "b3bae548aa53d423b0d1f27ebba6f5e5" .
+            "673a081d70cce7acfc48"
+        );
+        $computed_okm = self::HKDF("sha1", $ikm, $length);
+        if ($computed_okm !== $okm) {
+            throw new CryptoTestFailedException();
+        }
+
+    }
+
+    private static function HMACTestVector()
+    {
+        // HMAC test vector From RFC 4231 (Test Case 1)
+        $key = str_repeat("\x0b", 20);
+        $data = "Hi There";
+        $correct = "b0344c61d8db38535ca8afceaf0bf12b881dc200c9833da726e9376c2e32cff7";
+        if (hash_hmac(self::HASH_FUNCTION, $data, $key) != $correct) {
+            throw new CryptoTestFailedException();
+        }
+    }
+
+    private static function AESTestVector()
+    {
+        // AES CBC mode test vector from NIST SP 800-38A
+        $key = self::hexToBytes("2b7e151628aed2a6abf7158809cf4f3c");
+        $iv = self::hexToBytes("000102030405060708090a0b0c0d0e0f");
+        $plaintext = self::hexToBytes(
+            "6bc1bee22e409f96e93d7e117393172a" . 
+            "ae2d8a571e03ac9c9eb76fac45af8e51" .
+            "30c81c46a35ce411e5fbc1191a0a52ef" .
+            "f69f2445df4f9b17ad2b417be66c3710"
+        );
+        $ciphertext = self::hexToBytes(
+            "7649abac8119b246cee98e9b12e9197d" .
+            "5086cb9b507219ee95db113a917678b2" .
+            "73bed6b8e3c1743b7116e69e22229516" .
+            "3ff1caa1681fac09120eca307586e1a7" .
+            /* Block due to padding. Not from NIST test vector. 
+                Padding Block: 10101010101010101010101010101010
+                Ciphertext:    3ff1caa1681fac09120eca307586e1a7
+                           (+) 2fe1dab1780fbc19021eda206596f1b7 
+                           AES 8cb82807230e1321d3fae00d18cc2012
+             
+             */
+            "8cb82807230e1321d3fae00d18cc2012"
+        );
+
+        $computed_ciphertext = self::PlainEncrypt($plaintext, $key, $iv);
+        if ($computed_ciphertext !== $ciphertext) {
+            throw new CryptoTestFailedException();
+        }
+
+        $computed_plaintext = self::PlainDecrypt($ciphertext, $key, $iv);
+        if ($computed_plaintext !== $plaintext) {
+            throw new CryptoTestFailedException();
+        }
+    }
+
+    /* WARNING: Do not call this function on secrets. It creates side channels. */
+    private static function hexToBytes($hex_string)
+    {
+        return pack("H*", $hex_string);
+    }
+
+    private static function EnsureFunctionExists($name)
+    {
+        if (!function_exists($name)) {
+            throw new CannotPerformOperationException();
+        }
+    }
+
+    /*
+     * We need these strlen() and substr() functions because when
+     * 'mbstring.func_overload' is set in php.ini, the standard strlen() and
+     * substr() are replaced by mb_strlen() and mb_substr().
+     */
+
+    private static function our_strlen($str)
+    {
+        if (function_exists('mb_strlen')) {
+            $length = mb_strlen($str, '8bit');
+            if ($length === FALSE) {
+                throw new CannotPerformOperationException();
+            }
+            return $length;
+        } else {
+            return strlen($str);
+        }
+    }
+
+    private static function our_substr($str, $start, $length = NULL)
+    {
+        if (function_exists('mb_substr'))
+        {
+            // mb_substr($str, 0, NULL, '8bit') returns an empty string on PHP
+            // 5.3, so we have to find the length ourselves.
+            if (!isset($length)) {
+                if ($start >= 0) {
+                    $length = self::our_strlen($str) - $start;
+                } else {
+                    $length = -$start;
+                }
+            }
+
+            return mb_substr($str, $start, $length, '8bit');
+        }
+
+        // Unlike mb_substr(), substr() doesn't accept NULL for length
+        if (isset($length)) {
+            return substr($str, $start, $length);
+        } else {
+            return substr($str, $start);
+        }
+    }
+
+}
+
+/*
+ * We want to catch all uncaught exceptions that come from the Crypto class,
+ * since by default, PHP will leak the key in the stack trace from an uncaught
+ * exception. This is a really ugly hack, but I think it's justified.
+ *
+ * Everything up to handler() getting called should be reliable, so this should
+ * reliably suppress the stack traces. The rest is just a bonus so that we don't
+ * make it impossible to debug other exceptions.
+ *
+ * This bit of code was adapted from: http://stackoverflow.com/a/7939492
+ */
+
+class CryptoExceptionHandler
+{
+    private $rethrow = NULL;
+
+    public function __construct()
+    {
+        set_exception_handler(array($this, "handler"));
+    }
+
+    public function handler($ex)
+    {
+        if (
+            $ex instanceof InvalidCiphertextException ||
+            $ex instanceof CannotPerformOperationException ||
+            $ex instanceof CryptoTestFailedException
+        ) {
+            echo "FATAL ERROR: Uncaught crypto exception. Suppresssing output.\n";
+        } else {
+            /* Re-throw the exception in the destructor. */
+            $this->rethrow = $ex;
+        }
+    }
+
+    public function __destruct() {
+        if ($this->rethrow) {
+            throw $this->rethrow;
+        }
+    }
+}
+
+$crypto_exception_handler_object_dont_touch_me = new CryptoExceptionHandler();
+
diff --git a/libraries/defuse/php-encryption/README.md b/libraries/defuse/php-encryption/README.md
new file mode 100644
index 0000000000000..a564aedf4d8ac
--- /dev/null
+++ b/libraries/defuse/php-encryption/README.md
@@ -0,0 +1,79 @@
+php-encryption
+===============
+
+This is a class for doing symmetric encryption in PHP.
+
+[![Build Status](https://travis-ci.org/defuse/php-encryption.svg?branch=master)](https://travis-ci.org/defuse/php-encryption)
+
+Implementation
+--------------
+
+Messages are encrypted with AES-128 in CBC mode and are authenticated with
+HMAC-SHA256 (Encrypt-then-Mac). PKCS7 padding is used to pad the message to
+a multiple of the block size. HKDF is used to split the user-provided key into
+two keys: one for encryption, and the other for authentication. It is
+implemented using the `mcrypt_` and `hash_hmac` functions.
+
+Warning
+--------
+
+This is new code, and it hasn't received much review by experts. I have spent
+many hours making it as secure as possible (extensive runtime tests, secure
+coding practices), and auditing it for problems, but I may have missed some
+issues. So be careful. Don't trust it with your life. Check out the open GitHub
+issues for a list of known issues. If you find a problem with this library,
+please report it by opening a GitHub issue.
+
+That said, you're probably much better off using this library than any other
+encryption library written in PHP. 
+
+Philosophy
+-----------
+
+This library was created after noticing how much insecure PHP encryption code
+there is. I once did a Google search for "php encryption" and found insecure
+code or advice on 9 of the top 10 results.
+
+Encryption is becoming an essential component of modern websites. This library
+aims to fulfil a subset of that need: Authenticated symmetric encryption of
+short strings, given a random key.
+
+This library is developed around several core values:
+
+- Rule #1: Security is prioritized over everything else.
+
+    > Whenever there is a conflict between security and some other property,
+    > security will be favored. For example, the library has runtime tests,
+    > which make it slower, but will hopefully stop it from encrypting stuff
+    > if the platform it's running on is broken.
+
+- Rule #2: It should be difficult to misuse the library.
+
+    > We assume the developers using this library have no experience with
+    > cryptography. We only assume that they know that the "key" is something
+    > you need to encrypt and decrypt the messages, and that it must be
+    > protected. Whenever possible, the library should refuse to encrypt or
+    > decrypt messages when it is not being used correctly.
+
+- Rule #3: The library aims only to be compatible with itself.
+
+    > Other PHP encryption libraries try to support every possible type of
+    > encryption, even the insecure ones (e.g. ECB mode). Because there are so
+    > many options, inexperienced developers must make decisions between
+    > things like "CBC" mode and "ECB" mode, knowing nothing about either one,
+    > which inevitably creates vulnerabilities.
+
+    > This library will only support one secure mode. A developer using this
+    > library will call "encrypt" and "decrypt" not caring about how they are
+    > implemented.
+
+- Rule #4: The library should consist of a single PHP file and nothing more.
+
+    > Some PHP encryption libraries, like libsodium-php [1], are not
+    > straightforward to install and cannot packaged with "just download and
+    > extract" applications. This library will always be just one PHP file
+    > that you can put in your source tree and require().
+
+References:
+
+    [1] https://github.com/jedisct1/libsodium-php
diff --git a/libraries/defuse/php-encryption/benchmark.php b/libraries/defuse/php-encryption/benchmark.php
new file mode 100644
index 0000000000000..3da61a6285f6e
--- /dev/null
+++ b/libraries/defuse/php-encryption/benchmark.php
@@ -0,0 +1,42 @@
+<?php
+
+require_once('Crypto.php');
+
+// Note: By default, the runtime tests are "cached" and not re-executed for
+// every call. To disable this, look at the RuntimeTest() function.
+
+$start = microtime(true);
+for ($i = 0; $i < 1000; $i++) {
+    $key = Crypto::CreateNewRandomKey();
+}
+$end = microtime(true);
+showResults("CreateNewRandomKey()", $start, $end, 1000);
+
+$start = microtime(true);
+for ($i = 0; $i < 100; $i++) {
+    $ciphertext = Crypto::Encrypt(
+        str_repeat("A", 1024*1024), 
+        str_repeat("B", 16)
+    );
+}
+$end = microtime(true);
+showResults("Encrypt(1MB)", $start, $end, 100);
+
+$start = microtime(true);
+for ($i = 0; $i < 1000; $i++) {
+    $ciphertext = Crypto::Encrypt(
+        str_repeat("A", 1024), 
+        str_repeat("B", 16)
+    );
+}
+$end = microtime(true);
+showResults("Encrypt(1KB)", $start, $end, 1000);
+
+function showResults($type, $start, $end, $count)
+{
+    $time = $end - $start;
+    $rate = $count / $time;
+    echo "$type: $rate calls/s\n";
+}
+
+?>
diff --git a/libraries/defuse/php-encryption/example.php b/libraries/defuse/php-encryption/example.php
new file mode 100644
index 0000000000000..10e73f91542ef
--- /dev/null
+++ b/libraries/defuse/php-encryption/example.php
@@ -0,0 +1,36 @@
+<?php
+require_once('Crypto.php');
+  try {
+      $key = Crypto::CreateNewRandomKey();
+      // WARNING: Do NOT encode $key with bin2hex() or base64_encode(),
+      // they may leak the key to the attacker through side channels.
+  } catch (CryptoTestFailedException $ex) {
+      die('Cannot safely create a key');
+  } catch (CannotPerformOperationException $ex) {
+      die('Cannot safely create a key');
+  }
+
+  $message = "ATTACK AT DAWN";
+  try {
+      $ciphertext = Crypto::Encrypt($message, $key);
+  } catch (CryptoTestFailedException $ex) {
+      die('Cannot safely perform encryption');
+  } catch (CannotPerformOperationException $ex) {
+      die('Cannot safely perform decryption');
+  }
+
+  try {
+      $decrypted = Crypto::Decrypt($ciphertext, $key);
+  } catch (InvalidCiphertextException $ex) { // VERY IMPORTANT
+      // Either:
+      //   1. The ciphertext was modified by the attacker,
+      //   2. The key is wrong, or
+      //   3. $ciphertext is not a valid ciphertext or was corrupted.
+      // Assume the worst.
+      die('DANGER! DANGER! The ciphertext has been tampered with!');
+  } catch (CryptoTestFailedException $ex) {
+      die('Cannot safely perform encryption');
+  } catch (CannotPerformOperationException $ex) {
+      die('Cannot safely perform decryption');
+  }
+?>
diff --git a/libraries/defuse/php-encryption/test.sh b/libraries/defuse/php-encryption/test.sh
new file mode 100644
index 0000000000000..d1691e7c6e01f
--- /dev/null
+++ b/libraries/defuse/php-encryption/test.sh
@@ -0,0 +1,30 @@
+#!/bin/bash
+
+echo "Normal"
+echo "--------------------------------------------------"
+php -d mbstring.func_overload=0 tests/runtime.php
+if [ $? -ne 0 ]; then
+    echo "FAIL."
+    exit 1
+fi
+echo "--------------------------------------------------"
+
+echo ""
+
+echo "Multibyte"
+echo "--------------------------------------------------"
+php -d mbstring.func_overload=7 tests/runtime.php
+if [ $? -ne 0 ]; then
+    echo "FAIL."
+    exit 1
+fi
+echo "--------------------------------------------------"
+
+echo ""
+
+if [ -z "$(php Crypto.php)" ]; then
+    echo "PASS: Crypto.php output is empty."
+else
+    echo "FAIL: Crypto.php output is not empty."
+    exit 1
+fi
diff --git a/libraries/defuse/php-encryption/tests/runtime.php b/libraries/defuse/php-encryption/tests/runtime.php
new file mode 100644
index 0000000000000..76565c58e3eaa
--- /dev/null
+++ b/libraries/defuse/php-encryption/tests/runtime.php
@@ -0,0 +1,32 @@
+<?php
+
+// Set the encoding to something more "challenging."
+$ret = mb_internal_encoding('UTF-8');
+if ($ret === FALSE) {
+    echo "Couldn't set encoding.";
+    exit(1);
+}
+
+// Dump out the settings / encoding for future reference.
+$val = ini_get("mbstring.func_overload");
+echo "Settings: \n";
+echo "    func_overload: " . $val . "\n";
+echo "    mb_internal_encoding(): " . mb_internal_encoding() . "\n";
+
+// Perform the tests.
+require_once('Crypto.php');
+try {
+    Crypto::RuntimeTest();
+    echo "TEST PASSED!\n";
+    exit(0);
+} catch (CryptoTestFailedException $ex) {
+    echo "TEST FAILED!\n";
+    var_dump($ex);
+    exit(1);
+} catch (CannotPerformOperationException $ex) {
+    echo "TEST FAILED\n";
+    var_dump($ex);
+    exit(1);
+}
+
+?>
diff --git a/libraries/import.php b/libraries/import.php
index 2cd00da2506e9..9bc70d4964c8f 100644
--- a/libraries/import.php
+++ b/libraries/import.php
@@ -64,3 +64,6 @@
 
 // Register the PasswordHash lib
 JLoader::register('PasswordHash', JPATH_PLATFORM . '/phpass/PasswordHash.php');
+
+// Register the Crypto lib
+JLoader::register('Crypto', JPATH_PLATFORM . '/defuse/php-encryption/Crypto.php');

From cd4e499f2d718839c036bd6a347502a392d45324 Mon Sep 17 00:00:00 2001
From: Scott <scott@paragonie.com>
Date: Thu, 12 Nov 2015 16:36:07 -0500
Subject: [PATCH 042/176] Add security notice to joomla/crypt

---
 libraries/joomla/crypt/README.md | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 libraries/joomla/crypt/README.md

diff --git a/libraries/joomla/crypt/README.md b/libraries/joomla/crypt/README.md
new file mode 100644
index 0000000000000..17963657ea371
--- /dev/null
+++ b/libraries/joomla/crypt/README.md
@@ -0,0 +1,16 @@
+# Important Security Information
+
+JCrypt is being deprecated in Joomla 4 and is **not generally considered secure**.
+Please don't use it for any of your projects.
+
+Use [defuse/php-encryption](https://github.com/defuse/php-encryption) instead.
+We bundle version 1.1 as of Joomla 3.5.0.
+
+```php
+$message = 'Sensitive field';
+$key = Crypto::CreateNewRandomKey(); // Store this for long-term use
+$ciphertext = Crypto::encrypt($message, $key);
+$decrypted = Crypto::decrypt($ciphertext, $key);
+```
+
+If you continue to use JCrypt, you do so *at your own risk*.
\ No newline at end of file

From 29721950ce34aea01113c9e14ac466608aa4f4bc Mon Sep 17 00:00:00 2001
From: Scott <scott@paragonie.com>
Date: Thu, 12 Nov 2015 16:57:35 -0500
Subject: [PATCH 043/176] Use tabs, not spaces.

---
 libraries/defuse/php-encryption/Crypto.php    | 1112 ++++++++---------
 libraries/defuse/php-encryption/benchmark.php |   24 +-
 libraries/defuse/php-encryption/example.php   |   34 +-
 .../defuse/php-encryption/tests/runtime.php   |   22 +-
 4 files changed, 596 insertions(+), 596 deletions(-)

diff --git a/libraries/defuse/php-encryption/Crypto.php b/libraries/defuse/php-encryption/Crypto.php
index 1d7586f485bc1..5147a4ab4a25f 100644
--- a/libraries/defuse/php-encryption/Crypto.php
+++ b/libraries/defuse/php-encryption/Crypto.php
@@ -97,536 +97,536 @@ class CryptoTestFailedException extends Exception {}
 
 class Crypto
 {
-    // Ciphertext format: [____HMAC____][____IV____][____CIPHERTEXT____].
-
-    /* Do not change these constants! */
-    const CIPHER = MCRYPT_RIJNDAEL_128;
-    const KEY_BYTE_SIZE = 16;
-    const CIPHER_MODE = 'cbc';
-    const HASH_FUNCTION = 'sha256';
-    const MAC_BYTE_SIZE = 32;
-    const ENCRYPTION_INFO = 'DefusePHP|KeyForEncryption';
-    const AUTHENTICATION_INFO = 'DefusePHP|KeyForAuthentication';
-
-    /*
-     * Use this to generate a random encryption key.
-     */
-    public static function CreateNewRandomKey()
-    {
-        Crypto::RuntimeTest();
-        return self::SecureRandom(self::KEY_BYTE_SIZE);
-    }
-
-    /*
-     * Encrypts a message.
-     * $plaintext is the message to encrypt.
-     * $key is the encryption key, a value generated by CreateNewRandomKey().
-     * You MUST catch exceptions thrown by this function. See docs above.
-     */
-    public static function Encrypt($plaintext, $key)
-    {
-        Crypto::RuntimeTest();
-
-        if (self::our_strlen($key) !== self::KEY_BYTE_SIZE)
-        {
-            throw new CannotPerformOperationException("Bad key.");
-        }
-
-        // Generate a sub-key for encryption.
-        $keysize = self::KEY_BYTE_SIZE;
-        $ekey = self::HKDF(self::HASH_FUNCTION, $key, $keysize, self::ENCRYPTION_INFO);
-
-        // Generate a random initialization vector.
-        self::EnsureFunctionExists("mcrypt_get_iv_size");
-        $ivsize = mcrypt_get_iv_size(self::CIPHER, self::CIPHER_MODE);
-        if ($ivsize === FALSE || $ivsize <= 0) {
-            throw new CannotPerformOperationException();
-        }
-        $iv = self::SecureRandom($ivsize);
-
-        $ciphertext = $iv . self::PlainEncrypt($plaintext, $ekey, $iv);
-
-        // Generate a sub-key for authentication and apply the HMAC.
-        $akey = self::HKDF(self::HASH_FUNCTION, $key, self::KEY_BYTE_SIZE, self::AUTHENTICATION_INFO);
-        $auth = hash_hmac(self::HASH_FUNCTION, $ciphertext, $akey, true);
-        $ciphertext = $auth . $ciphertext;
-
-        return $ciphertext;
-    }
-
-    /*
-     * Decrypts a ciphertext.
-     * $ciphertext is the ciphertext to decrypt.
-     * $key is the key that the ciphertext was encrypted with.
-     * You MUST catch exceptions thrown by this function. See docs above.
-     */
-    public static function Decrypt($ciphertext, $key)
-    {
-        Crypto::RuntimeTest();
-
-        // Extract the HMAC from the front of the ciphertext.
-        if (self::our_strlen($ciphertext) <= self::MAC_BYTE_SIZE) {
-            throw new InvalidCiphertextException();
-        }
-        $hmac = self::our_substr($ciphertext, 0, self::MAC_BYTE_SIZE);
-        if ($hmac === FALSE) {
-            throw new CannotPerformOperationException();
-        }
-        $ciphertext = self::our_substr($ciphertext, self::MAC_BYTE_SIZE);
-        if ($ciphertext === FALSE) {
-            throw new CannotPerformOperationException();
-        }
-
-        // Regenerate the same authentication sub-key.
-        $akey = self::HKDF(self::HASH_FUNCTION, $key, self::KEY_BYTE_SIZE, self::AUTHENTICATION_INFO);
-
-        if (self::VerifyHMAC($hmac, $ciphertext, $akey))
-        {
-            // Regenerate the same encryption sub-key.
-            $keysize = self::KEY_BYTE_SIZE;
-            $ekey = self::HKDF(self::HASH_FUNCTION, $key, $keysize, self::ENCRYPTION_INFO);
-
-            // Extract the initialization vector from the ciphertext.
-            self::EnsureFunctionExists("mcrypt_get_iv_size");
-            $ivsize = mcrypt_get_iv_size(self::CIPHER, self::CIPHER_MODE);
-            if ($ivsize === FALSE || $ivsize <= 0) {
-                throw new CannotPerformOperationException();
-            }
-            if (self::our_strlen($ciphertext) <= $ivsize) {
-                throw new InvalidCiphertextException();
-            }
-            $iv = self::our_substr($ciphertext, 0, $ivsize);
-            if ($iv === FALSE) {
-                throw new CannotPerformOperationException();
-            }
-            $ciphertext = self::our_substr($ciphertext, $ivsize);
-            if ($ciphertext === FALSE) {
-                throw new CannotPerformOperationException();
-            }
-            
-            $plaintext = self::PlainDecrypt($ciphertext, $ekey, $iv);
-
-            return $plaintext;
-        }
-        else
-        {
-            /*
-             * We throw an exception instead of returning FALSE because we want
-             * a script that doesn't handle this condition to CRASH, instead
-             * of thinking the ciphertext decrypted to the value FALSE.
-             */
-             throw new InvalidCiphertextException();
-        }
-    }
-
-    /*
-     * Runs tests.
-     * Raises CannotPerformOperationException or CryptoTestFailedException if
-     * one of the tests fail. If any tests fails, your system is not capable of
-     * performing encryption, so make sure you fail safe in that case.
-     */
-    public static function RuntimeTest()
-    {
-        // 0: Tests haven't been run yet.
-        // 1: Tests have passed.
-        // 2: Tests are running right now.
-        // 3: Tests have failed.
-        static $test_state = 0;
-
-        if ($test_state === 1 || $test_state === 2) {
-            return;
-        }
-
-        try {
-            $test_state = 2;
-            self::AESTestVector();
-            self::HMACTestVector();
-            self::HKDFTestVector();
-
-            self::TestEncryptDecrypt();
-            if (self::our_strlen(Crypto::CreateNewRandomKey()) != self::KEY_BYTE_SIZE) {
-                throw new CryptoTestFailedException();
-            }
-
-            if (self::ENCRYPTION_INFO == self::AUTHENTICATION_INFO) {
-                throw new CryptoTestFailedException();
-            }
-        } catch (CryptoTestFailedException $ex) {
-            // Do this, otherwise it will stay in the "tests are running" state.
-            $test_state = 3;
-            throw $ex;
-        }
-
-        // Change this to '0' make the tests always re-run (for benchmarking).
-        $test_state = 1;
-    }
-
-    /*
-     * Never call this method directly!
-     */
-    private static function PlainEncrypt($plaintext, $key, $iv)
-    {
-        self::EnsureFunctionExists("mcrypt_module_open");
-        $crypt = mcrypt_module_open(self::CIPHER, "", self::CIPHER_MODE, "");
-        if ($crypt === FALSE) {
-            throw new CannotPerformOperationException();
-        }
-
-        // Pad the plaintext to a multiple of the block size.
-        self::EnsureFunctionExists("mcrypt_enc_get_block_size");
-        $block = mcrypt_enc_get_block_size($crypt);
-        $pad = $block - (self::our_strlen($plaintext) % $block);
-        $plaintext .= str_repeat(chr($pad), $pad);
-
-        self::EnsureFunctionExists("mcrypt_generic_init");
-        $ret = mcrypt_generic_init($crypt, $key, $iv);
-        if ($ret !== 0) {
-            throw new CannotPerformOperationException();
-        }
-        self::EnsureFunctionExists("mcrypt_generic");
-        $ciphertext = mcrypt_generic($crypt, $plaintext);
-        self::EnsureFunctionExists("mcrypt_generic_deinit");
-        $ret = mcrypt_generic_deinit($crypt);
-        if ($ret !== TRUE) {
-            throw new CannotPerformOperationException();
-        }
-        self::EnsureFunctionExists("mcrypt_module_close");
-        $ret = mcrypt_module_close($crypt);
-        if ($ret !== TRUE) {
-            throw new CannotPerformOperationException();
-        }
-
-        return $ciphertext;
-    }
-
-    /*
-     * Never call this method directly!
-     */
-    private static function PlainDecrypt($ciphertext, $key, $iv)
-    {
-        self::EnsureFunctionExists("mcrypt_module_open");
-        $crypt = mcrypt_module_open(self::CIPHER, "", self::CIPHER_MODE, "");
-        if ($crypt === FALSE) {
-            throw new CannotPerformOperationException();
-        }
-
-        self::EnsureFunctionExists("mcrypt_enc_get_block_size");
-        $block = mcrypt_enc_get_block_size($crypt);
-        self::EnsureFunctionExists("mcrypt_generic_init");
-        $ret = mcrypt_generic_init($crypt, $key, $iv);
-        if ($ret !== 0) {
-            throw new CannotPerformOperationException();
-        }
-        self::EnsureFunctionExists("mdecrypt_generic");
-        $plaintext = mdecrypt_generic($crypt, $ciphertext);
-        self::EnsureFunctionExists("mcrypt_generic_deinit");
-        $ret = mcrypt_generic_deinit($crypt);
-        if ($ret !== TRUE) {
-            throw new CannotPerformOperationException();
-        }
-        self::EnsureFunctionExists("mcrypt_module_close");
-        $ret = mcrypt_module_close($crypt);
-        if ($ret !== TRUE) {
-            throw new CannotPerformOperationException();
-        }
-
-        // Remove the padding.
-        $pad = ord($plaintext[self::our_strlen($plaintext) - 1]);
-        if ($pad <= 0 || $pad > $block) {
-            throw new CannotPerformOperationException();
-        }
-        $plaintext = self::our_substr($plaintext, 0, self::our_strlen($plaintext) - $pad);
-        if ($plaintext === FALSE) {
-            throw new CannotPerformOperationException();
-        }
-
-        return $plaintext;
-    }
-
-    /*
-     * Returns a random binary string of length $octets bytes.
-     */
-    private static function SecureRandom($octets)
-    {
-        self::EnsureFunctionExists("mcrypt_create_iv");
-        $random = mcrypt_create_iv($octets, MCRYPT_DEV_URANDOM);
-        if ($random === FALSE) {
-            throw new CannotPerformOperationException();
-        } else {
-            return $random;
-        }
-    }
-
-    /*
-     * Use HKDF to derive multiple keys from one.
-     * http://tools.ietf.org/html/rfc5869
-     */
-    private static function HKDF($hash, $ikm, $length, $info = '', $salt = NULL)
-    {
-        // Find the correct digest length as quickly as we can.
-        $digest_length = self::MAC_BYTE_SIZE;
-        if ($hash != self::HASH_FUNCTION) {
-            $digest_length = self::our_strlen(hash_hmac($hash, '', '', true));
-        }
-
-        // Sanity-check the desired output length.
-        if (empty($length) || !is_int($length) ||
-            $length < 0 || $length > 255 * $digest_length) {
-            throw new CannotPerformOperationException();
-        }
-
-        // "if [salt] not provided, is set to a string of HashLen zeroes."
-        if (is_null($salt)) {
-            $salt = str_repeat("\x00", $digest_length);
-        }
-
-        // HKDF-Extract:
-        // PRK = HMAC-Hash(salt, IKM)
-        // The salt is the HMAC key.
-        $prk = hash_hmac($hash, $ikm, $salt, true);
-
-        // HKDF-Expand:
-
-        // This check is useless, but it serves as a reminder to the spec.
-        if (self::our_strlen($prk) < $digest_length) {
-            throw new CannotPerformOperationException();
-        }
-
-        // T(0) = ''
-        $t = '';
-        $last_block = '';
-        for ($block_index = 1; self::our_strlen($t) < $length; $block_index++) {
-            // T(i) = HMAC-Hash(PRK, T(i-1) | info | 0x??)
-            $last_block = hash_hmac(
-                $hash,
-                $last_block . $info . chr($block_index),
-                $prk,
-                true
-            );
-            // T = T(1) | T(2) | T(3) | ... | T(N)
-            $t .= $last_block;
-        }
-
-        // ORM = first L octets of T
-        $orm = self::our_substr($t, 0, $length);
-        if ($orm === FALSE) {
-            throw new CannotPerformOperationException();
-        }
-        return $orm;
-    }
-
-    private static function VerifyHMAC($correct_hmac, $message, $key)
-    {
-        $message_hmac = hash_hmac(self::HASH_FUNCTION, $message, $key, true);
-
-        // We can't just compare the strings with '==', since it would make
-        // timing attacks possible. We could use the XOR-OR constant-time
-        // comparison algorithm, but I'm not sure if that's good enough way up
-        // here in an interpreted language. So we use the method of HMACing the 
-        // strings we want to compare with a random key, then comparing those.
-
-        // NOTE: This leaks information when the strings are not the same
-        // length, but they should always be the same length here. Enforce it:
-        if (self::our_strlen($correct_hmac) !== self::our_strlen($message_hmac)) {
-            throw new CannotPerformOperationException();
-        }
-
-        $blind = self::CreateNewRandomKey();
-        $message_compare = hash_hmac(self::HASH_FUNCTION, $message_hmac, $blind);
-        $correct_compare = hash_hmac(self::HASH_FUNCTION, $correct_hmac, $blind);
-        return $correct_compare === $message_compare;
-    }
-
-    private static function TestEncryptDecrypt()
-    {
-        $key = Crypto::CreateNewRandomKey();
-        $data = "EnCrYpT EvErYThInG\x00\x00";
-
-        // Make sure encrypting then decrypting doesn't change the message.
-        $ciphertext = Crypto::Encrypt($data, $key);
-        try {
-            $decrypted = Crypto::Decrypt($ciphertext, $key);
-        } catch (InvalidCiphertextException $ex) {
-            // It's important to catch this and change it into a 
-            // CryptoTestFailedException, otherwise a test failure could trick
-            // the user into thinking it's just an invalid ciphertext!
-            throw new CryptoTestFailedException();
-        }
-        if($decrypted !== $data)
-        {
-            throw new CryptoTestFailedException();
-        }
-
-        // Modifying the ciphertext: Appending a string.
-        try {
-            Crypto::Decrypt($ciphertext . "a", $key);
-            throw new CryptoTestFailedException();
-        } catch (InvalidCiphertextException $e) { /* expected */ }
-
-        // Modifying the ciphertext: Changing an IV byte.
-        try {
-            $ciphertext[0] = chr((ord($ciphertext[0]) + 1) % 256);
-            Crypto::Decrypt($ciphertext, $key);
-            throw new CryptoTestFailedException();
-        } catch (InvalidCiphertextException $e) { /* expected */ }
-
-        // Decrypting with the wrong key.
-        $key = Crypto::CreateNewRandomKey();
-        $data = "abcdef";
-        $ciphertext = Crypto::Encrypt($data, $key);
-        $wrong_key = Crypto::CreateNewRandomKey();
-        try {
-            Crypto::Decrypt($ciphertext, $wrong_key);
-            throw new CryptoTestFailedException();
-        } catch (InvalidCiphertextException $e) { /* expected */ }
-
-        // Ciphertext too small (shorter than HMAC).
-        $key = Crypto::CreateNewRandomKey();
-        $ciphertext = str_repeat("A", self::MAC_BYTE_SIZE - 1);
-        try {
-            Crypto::Decrypt($ciphertext, $key);
-            throw new CryptoTestFailedException();
-        } catch (InvalidCiphertextException $e) { /* expected */ }
-    }
-
-    private static function HKDFTestVector()
-    {
-        // HKDF test vectors from RFC 5869
-
-        // Test Case 1
-        $ikm = str_repeat("\x0b", 22);
-        $salt = self::hexToBytes("000102030405060708090a0b0c");
-        $info = self::hexToBytes("f0f1f2f3f4f5f6f7f8f9");
-        $length = 42;
-        $okm = self::hexToBytes(
-            "3cb25f25faacd57a90434f64d0362f2a" .
-            "2d2d0a90cf1a5a4c5db02d56ecc4c5bf" .
-            "34007208d5b887185865"
-        );
-        $computed_okm = self::HKDF("sha256", $ikm, $length, $info, $salt);
-        if ($computed_okm !== $okm) {
-            throw new CryptoTestFailedException();
-        }
-
-        // Test Case 7
-        $ikm = str_repeat("\x0c", 22);
-        $length = 42;
-        $okm = self::hexToBytes(
-            "2c91117204d745f3500d636a62f64f0a" .
-            "b3bae548aa53d423b0d1f27ebba6f5e5" .
-            "673a081d70cce7acfc48"
-        );
-        $computed_okm = self::HKDF("sha1", $ikm, $length);
-        if ($computed_okm !== $okm) {
-            throw new CryptoTestFailedException();
-        }
-
-    }
-
-    private static function HMACTestVector()
-    {
-        // HMAC test vector From RFC 4231 (Test Case 1)
-        $key = str_repeat("\x0b", 20);
-        $data = "Hi There";
-        $correct = "b0344c61d8db38535ca8afceaf0bf12b881dc200c9833da726e9376c2e32cff7";
-        if (hash_hmac(self::HASH_FUNCTION, $data, $key) != $correct) {
-            throw new CryptoTestFailedException();
-        }
-    }
-
-    private static function AESTestVector()
-    {
-        // AES CBC mode test vector from NIST SP 800-38A
-        $key = self::hexToBytes("2b7e151628aed2a6abf7158809cf4f3c");
-        $iv = self::hexToBytes("000102030405060708090a0b0c0d0e0f");
-        $plaintext = self::hexToBytes(
-            "6bc1bee22e409f96e93d7e117393172a" . 
-            "ae2d8a571e03ac9c9eb76fac45af8e51" .
-            "30c81c46a35ce411e5fbc1191a0a52ef" .
-            "f69f2445df4f9b17ad2b417be66c3710"
-        );
-        $ciphertext = self::hexToBytes(
-            "7649abac8119b246cee98e9b12e9197d" .
-            "5086cb9b507219ee95db113a917678b2" .
-            "73bed6b8e3c1743b7116e69e22229516" .
-            "3ff1caa1681fac09120eca307586e1a7" .
-            /* Block due to padding. Not from NIST test vector. 
-                Padding Block: 10101010101010101010101010101010
-                Ciphertext:    3ff1caa1681fac09120eca307586e1a7
-                           (+) 2fe1dab1780fbc19021eda206596f1b7 
-                           AES 8cb82807230e1321d3fae00d18cc2012
-             
-             */
-            "8cb82807230e1321d3fae00d18cc2012"
-        );
-
-        $computed_ciphertext = self::PlainEncrypt($plaintext, $key, $iv);
-        if ($computed_ciphertext !== $ciphertext) {
-            throw new CryptoTestFailedException();
-        }
-
-        $computed_plaintext = self::PlainDecrypt($ciphertext, $key, $iv);
-        if ($computed_plaintext !== $plaintext) {
-            throw new CryptoTestFailedException();
-        }
-    }
-
-    /* WARNING: Do not call this function on secrets. It creates side channels. */
-    private static function hexToBytes($hex_string)
-    {
-        return pack("H*", $hex_string);
-    }
-
-    private static function EnsureFunctionExists($name)
-    {
-        if (!function_exists($name)) {
-            throw new CannotPerformOperationException();
-        }
-    }
-
-    /*
-     * We need these strlen() and substr() functions because when
-     * 'mbstring.func_overload' is set in php.ini, the standard strlen() and
-     * substr() are replaced by mb_strlen() and mb_substr().
-     */
-
-    private static function our_strlen($str)
-    {
-        if (function_exists('mb_strlen')) {
-            $length = mb_strlen($str, '8bit');
-            if ($length === FALSE) {
-                throw new CannotPerformOperationException();
-            }
-            return $length;
-        } else {
-            return strlen($str);
-        }
-    }
-
-    private static function our_substr($str, $start, $length = NULL)
-    {
-        if (function_exists('mb_substr'))
-        {
-            // mb_substr($str, 0, NULL, '8bit') returns an empty string on PHP
-            // 5.3, so we have to find the length ourselves.
-            if (!isset($length)) {
-                if ($start >= 0) {
-                    $length = self::our_strlen($str) - $start;
-                } else {
-                    $length = -$start;
-                }
-            }
-
-            return mb_substr($str, $start, $length, '8bit');
-        }
-
-        // Unlike mb_substr(), substr() doesn't accept NULL for length
-        if (isset($length)) {
-            return substr($str, $start, $length);
-        } else {
-            return substr($str, $start);
-        }
-    }
+	// Ciphertext format: [____HMAC____][____IV____][____CIPHERTEXT____].
+
+	/* Do not change these constants! */
+	const CIPHER = MCRYPT_RIJNDAEL_128;
+	const KEY_BYTE_SIZE = 16;
+	const CIPHER_MODE = 'cbc';
+	const HASH_FUNCTION = 'sha256';
+	const MAC_BYTE_SIZE = 32;
+	const ENCRYPTION_INFO = 'DefusePHP|KeyForEncryption';
+	const AUTHENTICATION_INFO = 'DefusePHP|KeyForAuthentication';
+
+	/*
+	 * Use this to generate a random encryption key.
+	 */
+	public static function CreateNewRandomKey()
+	{
+		Crypto::RuntimeTest();
+		return self::SecureRandom(self::KEY_BYTE_SIZE);
+	}
+
+	/*
+	 * Encrypts a message.
+	 * $plaintext is the message to encrypt.
+	 * $key is the encryption key, a value generated by CreateNewRandomKey().
+	 * You MUST catch exceptions thrown by this function. See docs above.
+	 */
+	public static function Encrypt($plaintext, $key)
+	{
+		Crypto::RuntimeTest();
+
+		if (self::our_strlen($key) !== self::KEY_BYTE_SIZE)
+		{
+			throw new CannotPerformOperationException("Bad key.");
+		}
+
+		// Generate a sub-key for encryption.
+		$keysize = self::KEY_BYTE_SIZE;
+		$ekey = self::HKDF(self::HASH_FUNCTION, $key, $keysize, self::ENCRYPTION_INFO);
+
+		// Generate a random initialization vector.
+		self::EnsureFunctionExists("mcrypt_get_iv_size");
+		$ivsize = mcrypt_get_iv_size(self::CIPHER, self::CIPHER_MODE);
+		if ($ivsize === FALSE || $ivsize <= 0) {
+			throw new CannotPerformOperationException();
+		}
+		$iv = self::SecureRandom($ivsize);
+
+		$ciphertext = $iv . self::PlainEncrypt($plaintext, $ekey, $iv);
+
+		// Generate a sub-key for authentication and apply the HMAC.
+		$akey = self::HKDF(self::HASH_FUNCTION, $key, self::KEY_BYTE_SIZE, self::AUTHENTICATION_INFO);
+		$auth = hash_hmac(self::HASH_FUNCTION, $ciphertext, $akey, true);
+		$ciphertext = $auth . $ciphertext;
+
+		return $ciphertext;
+	}
+
+	/*
+	 * Decrypts a ciphertext.
+	 * $ciphertext is the ciphertext to decrypt.
+	 * $key is the key that the ciphertext was encrypted with.
+	 * You MUST catch exceptions thrown by this function. See docs above.
+	 */
+	public static function Decrypt($ciphertext, $key)
+	{
+		Crypto::RuntimeTest();
+
+		// Extract the HMAC from the front of the ciphertext.
+		if (self::our_strlen($ciphertext) <= self::MAC_BYTE_SIZE) {
+			throw new InvalidCiphertextException();
+		}
+		$hmac = self::our_substr($ciphertext, 0, self::MAC_BYTE_SIZE);
+		if ($hmac === FALSE) {
+			throw new CannotPerformOperationException();
+		}
+		$ciphertext = self::our_substr($ciphertext, self::MAC_BYTE_SIZE);
+		if ($ciphertext === FALSE) {
+			throw new CannotPerformOperationException();
+		}
+
+		// Regenerate the same authentication sub-key.
+		$akey = self::HKDF(self::HASH_FUNCTION, $key, self::KEY_BYTE_SIZE, self::AUTHENTICATION_INFO);
+
+		if (self::VerifyHMAC($hmac, $ciphertext, $akey))
+		{
+			// Regenerate the same encryption sub-key.
+			$keysize = self::KEY_BYTE_SIZE;
+			$ekey = self::HKDF(self::HASH_FUNCTION, $key, $keysize, self::ENCRYPTION_INFO);
+
+			// Extract the initialization vector from the ciphertext.
+			self::EnsureFunctionExists("mcrypt_get_iv_size");
+			$ivsize = mcrypt_get_iv_size(self::CIPHER, self::CIPHER_MODE);
+			if ($ivsize === FALSE || $ivsize <= 0) {
+				throw new CannotPerformOperationException();
+			}
+			if (self::our_strlen($ciphertext) <= $ivsize) {
+				throw new InvalidCiphertextException();
+			}
+			$iv = self::our_substr($ciphertext, 0, $ivsize);
+			if ($iv === FALSE) {
+				throw new CannotPerformOperationException();
+			}
+			$ciphertext = self::our_substr($ciphertext, $ivsize);
+			if ($ciphertext === FALSE) {
+				throw new CannotPerformOperationException();
+			}
+			
+			$plaintext = self::PlainDecrypt($ciphertext, $ekey, $iv);
+
+			return $plaintext;
+		}
+		else
+		{
+			/*
+			 * We throw an exception instead of returning FALSE because we want
+			 * a script that doesn't handle this condition to CRASH, instead
+			 * of thinking the ciphertext decrypted to the value FALSE.
+			 */
+			 throw new InvalidCiphertextException();
+		}
+	}
+
+	/*
+	 * Runs tests.
+	 * Raises CannotPerformOperationException or CryptoTestFailedException if
+	 * one of the tests fail. If any tests fails, your system is not capable of
+	 * performing encryption, so make sure you fail safe in that case.
+	 */
+	public static function RuntimeTest()
+	{
+		// 0: Tests haven't been run yet.
+		// 1: Tests have passed.
+		// 2: Tests are running right now.
+		// 3: Tests have failed.
+		static $test_state = 0;
+
+		if ($test_state === 1 || $test_state === 2) {
+			return;
+		}
+
+		try {
+			$test_state = 2;
+			self::AESTestVector();
+			self::HMACTestVector();
+			self::HKDFTestVector();
+
+			self::TestEncryptDecrypt();
+			if (self::our_strlen(Crypto::CreateNewRandomKey()) != self::KEY_BYTE_SIZE) {
+				throw new CryptoTestFailedException();
+			}
+
+			if (self::ENCRYPTION_INFO == self::AUTHENTICATION_INFO) {
+				throw new CryptoTestFailedException();
+			}
+		} catch (CryptoTestFailedException $ex) {
+			// Do this, otherwise it will stay in the "tests are running" state.
+			$test_state = 3;
+			throw $ex;
+		}
+
+		// Change this to '0' make the tests always re-run (for benchmarking).
+		$test_state = 1;
+	}
+
+	/*
+	 * Never call this method directly!
+	 */
+	private static function PlainEncrypt($plaintext, $key, $iv)
+	{
+		self::EnsureFunctionExists("mcrypt_module_open");
+		$crypt = mcrypt_module_open(self::CIPHER, "", self::CIPHER_MODE, "");
+		if ($crypt === FALSE) {
+			throw new CannotPerformOperationException();
+		}
+
+		// Pad the plaintext to a multiple of the block size.
+		self::EnsureFunctionExists("mcrypt_enc_get_block_size");
+		$block = mcrypt_enc_get_block_size($crypt);
+		$pad = $block - (self::our_strlen($plaintext) % $block);
+		$plaintext .= str_repeat(chr($pad), $pad);
+
+		self::EnsureFunctionExists("mcrypt_generic_init");
+		$ret = mcrypt_generic_init($crypt, $key, $iv);
+		if ($ret !== 0) {
+			throw new CannotPerformOperationException();
+		}
+		self::EnsureFunctionExists("mcrypt_generic");
+		$ciphertext = mcrypt_generic($crypt, $plaintext);
+		self::EnsureFunctionExists("mcrypt_generic_deinit");
+		$ret = mcrypt_generic_deinit($crypt);
+		if ($ret !== TRUE) {
+			throw new CannotPerformOperationException();
+		}
+		self::EnsureFunctionExists("mcrypt_module_close");
+		$ret = mcrypt_module_close($crypt);
+		if ($ret !== TRUE) {
+			throw new CannotPerformOperationException();
+		}
+
+		return $ciphertext;
+	}
+
+	/*
+	 * Never call this method directly!
+	 */
+	private static function PlainDecrypt($ciphertext, $key, $iv)
+	{
+		self::EnsureFunctionExists("mcrypt_module_open");
+		$crypt = mcrypt_module_open(self::CIPHER, "", self::CIPHER_MODE, "");
+		if ($crypt === FALSE) {
+			throw new CannotPerformOperationException();
+		}
+
+		self::EnsureFunctionExists("mcrypt_enc_get_block_size");
+		$block = mcrypt_enc_get_block_size($crypt);
+		self::EnsureFunctionExists("mcrypt_generic_init");
+		$ret = mcrypt_generic_init($crypt, $key, $iv);
+		if ($ret !== 0) {
+			throw new CannotPerformOperationException();
+		}
+		self::EnsureFunctionExists("mdecrypt_generic");
+		$plaintext = mdecrypt_generic($crypt, $ciphertext);
+		self::EnsureFunctionExists("mcrypt_generic_deinit");
+		$ret = mcrypt_generic_deinit($crypt);
+		if ($ret !== TRUE) {
+			throw new CannotPerformOperationException();
+		}
+		self::EnsureFunctionExists("mcrypt_module_close");
+		$ret = mcrypt_module_close($crypt);
+		if ($ret !== TRUE) {
+			throw new CannotPerformOperationException();
+		}
+
+		// Remove the padding.
+		$pad = ord($plaintext[self::our_strlen($plaintext) - 1]);
+		if ($pad <= 0 || $pad > $block) {
+			throw new CannotPerformOperationException();
+		}
+		$plaintext = self::our_substr($plaintext, 0, self::our_strlen($plaintext) - $pad);
+		if ($plaintext === FALSE) {
+			throw new CannotPerformOperationException();
+		}
+
+		return $plaintext;
+	}
+
+	/*
+	 * Returns a random binary string of length $octets bytes.
+	 */
+	private static function SecureRandom($octets)
+	{
+		self::EnsureFunctionExists("mcrypt_create_iv");
+		$random = mcrypt_create_iv($octets, MCRYPT_DEV_URANDOM);
+		if ($random === FALSE) {
+			throw new CannotPerformOperationException();
+		} else {
+			return $random;
+		}
+	}
+
+	/*
+	 * Use HKDF to derive multiple keys from one.
+	 * http://tools.ietf.org/html/rfc5869
+	 */
+	private static function HKDF($hash, $ikm, $length, $info = '', $salt = NULL)
+	{
+		// Find the correct digest length as quickly as we can.
+		$digest_length = self::MAC_BYTE_SIZE;
+		if ($hash != self::HASH_FUNCTION) {
+			$digest_length = self::our_strlen(hash_hmac($hash, '', '', true));
+		}
+
+		// Sanity-check the desired output length.
+		if (empty($length) || !is_int($length) ||
+			$length < 0 || $length > 255 * $digest_length) {
+			throw new CannotPerformOperationException();
+		}
+
+		// "if [salt] not provided, is set to a string of HashLen zeroes."
+		if (is_null($salt)) {
+			$salt = str_repeat("\x00", $digest_length);
+		}
+
+		// HKDF-Extract:
+		// PRK = HMAC-Hash(salt, IKM)
+		// The salt is the HMAC key.
+		$prk = hash_hmac($hash, $ikm, $salt, true);
+
+		// HKDF-Expand:
+
+		// This check is useless, but it serves as a reminder to the spec.
+		if (self::our_strlen($prk) < $digest_length) {
+			throw new CannotPerformOperationException();
+		}
+
+		// T(0) = ''
+		$t = '';
+		$last_block = '';
+		for ($block_index = 1; self::our_strlen($t) < $length; $block_index++) {
+			// T(i) = HMAC-Hash(PRK, T(i-1) | info | 0x??)
+			$last_block = hash_hmac(
+				$hash,
+				$last_block . $info . chr($block_index),
+				$prk,
+				true
+			);
+			// T = T(1) | T(2) | T(3) | ... | T(N)
+			$t .= $last_block;
+		}
+
+		// ORM = first L octets of T
+		$orm = self::our_substr($t, 0, $length);
+		if ($orm === FALSE) {
+			throw new CannotPerformOperationException();
+		}
+		return $orm;
+	}
+
+	private static function VerifyHMAC($correct_hmac, $message, $key)
+	{
+		$message_hmac = hash_hmac(self::HASH_FUNCTION, $message, $key, true);
+
+		// We can't just compare the strings with '==', since it would make
+		// timing attacks possible. We could use the XOR-OR constant-time
+		// comparison algorithm, but I'm not sure if that's good enough way up
+		// here in an interpreted language. So we use the method of HMACing the 
+		// strings we want to compare with a random key, then comparing those.
+
+		// NOTE: This leaks information when the strings are not the same
+		// length, but they should always be the same length here. Enforce it:
+		if (self::our_strlen($correct_hmac) !== self::our_strlen($message_hmac)) {
+			throw new CannotPerformOperationException();
+		}
+
+		$blind = self::CreateNewRandomKey();
+		$message_compare = hash_hmac(self::HASH_FUNCTION, $message_hmac, $blind);
+		$correct_compare = hash_hmac(self::HASH_FUNCTION, $correct_hmac, $blind);
+		return $correct_compare === $message_compare;
+	}
+
+	private static function TestEncryptDecrypt()
+	{
+		$key = Crypto::CreateNewRandomKey();
+		$data = "EnCrYpT EvErYThInG\x00\x00";
+
+		// Make sure encrypting then decrypting doesn't change the message.
+		$ciphertext = Crypto::Encrypt($data, $key);
+		try {
+			$decrypted = Crypto::Decrypt($ciphertext, $key);
+		} catch (InvalidCiphertextException $ex) {
+			// It's important to catch this and change it into a 
+			// CryptoTestFailedException, otherwise a test failure could trick
+			// the user into thinking it's just an invalid ciphertext!
+			throw new CryptoTestFailedException();
+		}
+		if($decrypted !== $data)
+		{
+			throw new CryptoTestFailedException();
+		}
+
+		// Modifying the ciphertext: Appending a string.
+		try {
+			Crypto::Decrypt($ciphertext . "a", $key);
+			throw new CryptoTestFailedException();
+		} catch (InvalidCiphertextException $e) { /* expected */ }
+
+		// Modifying the ciphertext: Changing an IV byte.
+		try {
+			$ciphertext[0] = chr((ord($ciphertext[0]) + 1) % 256);
+			Crypto::Decrypt($ciphertext, $key);
+			throw new CryptoTestFailedException();
+		} catch (InvalidCiphertextException $e) { /* expected */ }
+
+		// Decrypting with the wrong key.
+		$key = Crypto::CreateNewRandomKey();
+		$data = "abcdef";
+		$ciphertext = Crypto::Encrypt($data, $key);
+		$wrong_key = Crypto::CreateNewRandomKey();
+		try {
+			Crypto::Decrypt($ciphertext, $wrong_key);
+			throw new CryptoTestFailedException();
+		} catch (InvalidCiphertextException $e) { /* expected */ }
+
+		// Ciphertext too small (shorter than HMAC).
+		$key = Crypto::CreateNewRandomKey();
+		$ciphertext = str_repeat("A", self::MAC_BYTE_SIZE - 1);
+		try {
+			Crypto::Decrypt($ciphertext, $key);
+			throw new CryptoTestFailedException();
+		} catch (InvalidCiphertextException $e) { /* expected */ }
+	}
+
+	private static function HKDFTestVector()
+	{
+		// HKDF test vectors from RFC 5869
+
+		// Test Case 1
+		$ikm = str_repeat("\x0b", 22);
+		$salt = self::hexToBytes("000102030405060708090a0b0c");
+		$info = self::hexToBytes("f0f1f2f3f4f5f6f7f8f9");
+		$length = 42;
+		$okm = self::hexToBytes(
+			"3cb25f25faacd57a90434f64d0362f2a" .
+			"2d2d0a90cf1a5a4c5db02d56ecc4c5bf" .
+			"34007208d5b887185865"
+		);
+		$computed_okm = self::HKDF("sha256", $ikm, $length, $info, $salt);
+		if ($computed_okm !== $okm) {
+			throw new CryptoTestFailedException();
+		}
+
+		// Test Case 7
+		$ikm = str_repeat("\x0c", 22);
+		$length = 42;
+		$okm = self::hexToBytes(
+			"2c91117204d745f3500d636a62f64f0a" .
+			"b3bae548aa53d423b0d1f27ebba6f5e5" .
+			"673a081d70cce7acfc48"
+		);
+		$computed_okm = self::HKDF("sha1", $ikm, $length);
+		if ($computed_okm !== $okm) {
+			throw new CryptoTestFailedException();
+		}
+
+	}
+
+	private static function HMACTestVector()
+	{
+		// HMAC test vector From RFC 4231 (Test Case 1)
+		$key = str_repeat("\x0b", 20);
+		$data = "Hi There";
+		$correct = "b0344c61d8db38535ca8afceaf0bf12b881dc200c9833da726e9376c2e32cff7";
+		if (hash_hmac(self::HASH_FUNCTION, $data, $key) != $correct) {
+			throw new CryptoTestFailedException();
+		}
+	}
+
+	private static function AESTestVector()
+	{
+		// AES CBC mode test vector from NIST SP 800-38A
+		$key = self::hexToBytes("2b7e151628aed2a6abf7158809cf4f3c");
+		$iv = self::hexToBytes("000102030405060708090a0b0c0d0e0f");
+		$plaintext = self::hexToBytes(
+			"6bc1bee22e409f96e93d7e117393172a" . 
+			"ae2d8a571e03ac9c9eb76fac45af8e51" .
+			"30c81c46a35ce411e5fbc1191a0a52ef" .
+			"f69f2445df4f9b17ad2b417be66c3710"
+		);
+		$ciphertext = self::hexToBytes(
+			"7649abac8119b246cee98e9b12e9197d" .
+			"5086cb9b507219ee95db113a917678b2" .
+			"73bed6b8e3c1743b7116e69e22229516" .
+			"3ff1caa1681fac09120eca307586e1a7" .
+			/* Block due to padding. Not from NIST test vector. 
+				Padding Block: 10101010101010101010101010101010
+				Ciphertext:    3ff1caa1681fac09120eca307586e1a7
+						   (+) 2fe1dab1780fbc19021eda206596f1b7 
+						   AES 8cb82807230e1321d3fae00d18cc2012
+			 
+			 */
+			"8cb82807230e1321d3fae00d18cc2012"
+		);
+
+		$computed_ciphertext = self::PlainEncrypt($plaintext, $key, $iv);
+		if ($computed_ciphertext !== $ciphertext) {
+			throw new CryptoTestFailedException();
+		}
+
+		$computed_plaintext = self::PlainDecrypt($ciphertext, $key, $iv);
+		if ($computed_plaintext !== $plaintext) {
+			throw new CryptoTestFailedException();
+		}
+	}
+
+	/* WARNING: Do not call this function on secrets. It creates side channels. */
+	private static function hexToBytes($hex_string)
+	{
+		return pack("H*", $hex_string);
+	}
+
+	private static function EnsureFunctionExists($name)
+	{
+		if (!function_exists($name)) {
+			throw new CannotPerformOperationException();
+		}
+	}
+
+	/*
+	 * We need these strlen() and substr() functions because when
+	 * 'mbstring.func_overload' is set in php.ini, the standard strlen() and
+	 * substr() are replaced by mb_strlen() and mb_substr().
+	 */
+
+	private static function our_strlen($str)
+	{
+		if (function_exists('mb_strlen')) {
+			$length = mb_strlen($str, '8bit');
+			if ($length === FALSE) {
+				throw new CannotPerformOperationException();
+			}
+			return $length;
+		} else {
+			return strlen($str);
+		}
+	}
+
+	private static function our_substr($str, $start, $length = NULL)
+	{
+		if (function_exists('mb_substr'))
+		{
+			// mb_substr($str, 0, NULL, '8bit') returns an empty string on PHP
+			// 5.3, so we have to find the length ourselves.
+			if (!isset($length)) {
+				if ($start >= 0) {
+					$length = self::our_strlen($str) - $start;
+				} else {
+					$length = -$start;
+				}
+			}
+
+			return mb_substr($str, $start, $length, '8bit');
+		}
+
+		// Unlike mb_substr(), substr() doesn't accept NULL for length
+		if (isset($length)) {
+			return substr($str, $start, $length);
+		} else {
+			return substr($str, $start);
+		}
+	}
 
 }
 
@@ -644,32 +644,32 @@ private static function our_substr($str, $start, $length = NULL)
 
 class CryptoExceptionHandler
 {
-    private $rethrow = NULL;
-
-    public function __construct()
-    {
-        set_exception_handler(array($this, "handler"));
-    }
-
-    public function handler($ex)
-    {
-        if (
-            $ex instanceof InvalidCiphertextException ||
-            $ex instanceof CannotPerformOperationException ||
-            $ex instanceof CryptoTestFailedException
-        ) {
-            echo "FATAL ERROR: Uncaught crypto exception. Suppresssing output.\n";
-        } else {
-            /* Re-throw the exception in the destructor. */
-            $this->rethrow = $ex;
-        }
-    }
-
-    public function __destruct() {
-        if ($this->rethrow) {
-            throw $this->rethrow;
-        }
-    }
+	private $rethrow = NULL;
+
+	public function __construct()
+	{
+		set_exception_handler(array($this, "handler"));
+	}
+
+	public function handler($ex)
+	{
+		if (
+			$ex instanceof InvalidCiphertextException ||
+			$ex instanceof CannotPerformOperationException ||
+			$ex instanceof CryptoTestFailedException
+		) {
+			echo "FATAL ERROR: Uncaught crypto exception. Suppresssing output.\n";
+		} else {
+			/* Re-throw the exception in the destructor. */
+			$this->rethrow = $ex;
+		}
+	}
+
+	public function __destruct() {
+		if ($this->rethrow) {
+			throw $this->rethrow;
+		}
+	}
 }
 
 $crypto_exception_handler_object_dont_touch_me = new CryptoExceptionHandler();
diff --git a/libraries/defuse/php-encryption/benchmark.php b/libraries/defuse/php-encryption/benchmark.php
index 3da61a6285f6e..13ebec5382343 100644
--- a/libraries/defuse/php-encryption/benchmark.php
+++ b/libraries/defuse/php-encryption/benchmark.php
@@ -7,36 +7,36 @@
 
 $start = microtime(true);
 for ($i = 0; $i < 1000; $i++) {
-    $key = Crypto::CreateNewRandomKey();
+	$key = Crypto::CreateNewRandomKey();
 }
 $end = microtime(true);
 showResults("CreateNewRandomKey()", $start, $end, 1000);
 
 $start = microtime(true);
 for ($i = 0; $i < 100; $i++) {
-    $ciphertext = Crypto::Encrypt(
-        str_repeat("A", 1024*1024), 
-        str_repeat("B", 16)
-    );
+	$ciphertext = Crypto::Encrypt(
+		str_repeat("A", 1024*1024), 
+		str_repeat("B", 16)
+	);
 }
 $end = microtime(true);
 showResults("Encrypt(1MB)", $start, $end, 100);
 
 $start = microtime(true);
 for ($i = 0; $i < 1000; $i++) {
-    $ciphertext = Crypto::Encrypt(
-        str_repeat("A", 1024), 
-        str_repeat("B", 16)
-    );
+	$ciphertext = Crypto::Encrypt(
+		str_repeat("A", 1024), 
+		str_repeat("B", 16)
+	);
 }
 $end = microtime(true);
 showResults("Encrypt(1KB)", $start, $end, 1000);
 
 function showResults($type, $start, $end, $count)
 {
-    $time = $end - $start;
-    $rate = $count / $time;
-    echo "$type: $rate calls/s\n";
+	$time = $end - $start;
+	$rate = $count / $time;
+	echo "$type: $rate calls/s\n";
 }
 
 ?>
diff --git a/libraries/defuse/php-encryption/example.php b/libraries/defuse/php-encryption/example.php
index 10e73f91542ef..76b3558ca3b5c 100644
--- a/libraries/defuse/php-encryption/example.php
+++ b/libraries/defuse/php-encryption/example.php
@@ -1,36 +1,36 @@
 <?php
 require_once('Crypto.php');
   try {
-      $key = Crypto::CreateNewRandomKey();
-      // WARNING: Do NOT encode $key with bin2hex() or base64_encode(),
-      // they may leak the key to the attacker through side channels.
+	  $key = Crypto::CreateNewRandomKey();
+	  // WARNING: Do NOT encode $key with bin2hex() or base64_encode(),
+	  // they may leak the key to the attacker through side channels.
   } catch (CryptoTestFailedException $ex) {
-      die('Cannot safely create a key');
+	  die('Cannot safely create a key');
   } catch (CannotPerformOperationException $ex) {
-      die('Cannot safely create a key');
+	  die('Cannot safely create a key');
   }
 
   $message = "ATTACK AT DAWN";
   try {
-      $ciphertext = Crypto::Encrypt($message, $key);
+	  $ciphertext = Crypto::Encrypt($message, $key);
   } catch (CryptoTestFailedException $ex) {
-      die('Cannot safely perform encryption');
+	  die('Cannot safely perform encryption');
   } catch (CannotPerformOperationException $ex) {
-      die('Cannot safely perform decryption');
+	  die('Cannot safely perform decryption');
   }
 
   try {
-      $decrypted = Crypto::Decrypt($ciphertext, $key);
+	  $decrypted = Crypto::Decrypt($ciphertext, $key);
   } catch (InvalidCiphertextException $ex) { // VERY IMPORTANT
-      // Either:
-      //   1. The ciphertext was modified by the attacker,
-      //   2. The key is wrong, or
-      //   3. $ciphertext is not a valid ciphertext or was corrupted.
-      // Assume the worst.
-      die('DANGER! DANGER! The ciphertext has been tampered with!');
+	  // Either:
+	  //   1. The ciphertext was modified by the attacker,
+	  //   2. The key is wrong, or
+	  //   3. $ciphertext is not a valid ciphertext or was corrupted.
+	  // Assume the worst.
+	  die('DANGER! DANGER! The ciphertext has been tampered with!');
   } catch (CryptoTestFailedException $ex) {
-      die('Cannot safely perform encryption');
+	  die('Cannot safely perform encryption');
   } catch (CannotPerformOperationException $ex) {
-      die('Cannot safely perform decryption');
+	  die('Cannot safely perform decryption');
   }
 ?>
diff --git a/libraries/defuse/php-encryption/tests/runtime.php b/libraries/defuse/php-encryption/tests/runtime.php
index 76565c58e3eaa..8b6e4aed00c84 100644
--- a/libraries/defuse/php-encryption/tests/runtime.php
+++ b/libraries/defuse/php-encryption/tests/runtime.php
@@ -3,8 +3,8 @@
 // Set the encoding to something more "challenging."
 $ret = mb_internal_encoding('UTF-8');
 if ($ret === FALSE) {
-    echo "Couldn't set encoding.";
-    exit(1);
+	echo "Couldn't set encoding.";
+	exit(1);
 }
 
 // Dump out the settings / encoding for future reference.
@@ -16,17 +16,17 @@
 // Perform the tests.
 require_once('Crypto.php');
 try {
-    Crypto::RuntimeTest();
-    echo "TEST PASSED!\n";
-    exit(0);
+	Crypto::RuntimeTest();
+	echo "TEST PASSED!\n";
+	exit(0);
 } catch (CryptoTestFailedException $ex) {
-    echo "TEST FAILED!\n";
-    var_dump($ex);
-    exit(1);
+	echo "TEST FAILED!\n";
+	var_dump($ex);
+	exit(1);
 } catch (CannotPerformOperationException $ex) {
-    echo "TEST FAILED\n";
-    var_dump($ex);
-    exit(1);
+	echo "TEST FAILED\n";
+	var_dump($ex);
+	exit(1);
 }
 
 ?>

From cedeaa076aa03d735be4bf37577387bf6db34492 Mon Sep 17 00:00:00 2001
From: Michael Babker <mbabker@flbab.com>
Date: Thu, 12 Nov 2015 17:30:16 -0500
Subject: [PATCH 044/176] Shuffle around the php-encryption library setup

---
 build/phpcs/Joomla/ruleset.xml                |   1 +
 libraries/cms.php                             |   3 +
 libraries/defuse/php-encryption/.travis.yml   |  15 -
 libraries/defuse/php-encryption/Crypto.php    | 676 ------------------
 libraries/defuse/php-encryption/README.md     |  79 --
 libraries/defuse/php-encryption/benchmark.php |  42 --
 libraries/defuse/php-encryption/example.php   |  36 -
 libraries/defuse/php-encryption/test.sh       |  30 -
 .../defuse/php-encryption/tests/runtime.php   |  32 -
 libraries/import.php                          |   3 -
 libraries/php-encryption/Crypto.php           | 676 ++++++++++++++++++
 11 files changed, 680 insertions(+), 913 deletions(-)
 delete mode 100644 libraries/defuse/php-encryption/.travis.yml
 delete mode 100644 libraries/defuse/php-encryption/Crypto.php
 delete mode 100644 libraries/defuse/php-encryption/README.md
 delete mode 100644 libraries/defuse/php-encryption/benchmark.php
 delete mode 100644 libraries/defuse/php-encryption/example.php
 delete mode 100644 libraries/defuse/php-encryption/test.sh
 delete mode 100644 libraries/defuse/php-encryption/tests/runtime.php
 create mode 100644 libraries/php-encryption/Crypto.php

diff --git a/build/phpcs/Joomla/ruleset.xml b/build/phpcs/Joomla/ruleset.xml
index a89bb3b2c472a..55fbbf0afd19d 100644
--- a/build/phpcs/Joomla/ruleset.xml
+++ b/build/phpcs/Joomla/ruleset.xml
@@ -14,6 +14,7 @@
  <exclude-pattern type="relative">libraries/compat/password/*</exclude-pattern>
  <exclude-pattern type="relative">libraries/fof/*</exclude-pattern>
  <exclude-pattern type="relative">libraries/idna_convert/*</exclude-pattern>
+ <exclude-pattern type="relative">libraries/php-encryption/*</exclude-pattern>
  <exclude-pattern type="relative">libraries/phputf8/*</exclude-pattern>
  <exclude-pattern type="relative">libraries/simplepie/*</exclude-pattern>
  <exclude-pattern type="relative">libraries/phpass/*</exclude-pattern>
diff --git a/libraries/cms.php b/libraries/cms.php
index e0a831699ed64..1e22507a2323a 100644
--- a/libraries/cms.php
+++ b/libraries/cms.php
@@ -64,6 +64,9 @@
 // Register JArrayHelper due to JRegistry moved to composer's vendor folder
 JLoader::register('JArrayHelper', JPATH_PLATFORM . '/joomla/utilities/arrayhelper.php');
 
+// Register the Crypto lib
+JLoader::register('Crypto', JPATH_PLATFORM . '/php-encryption/Crypto.php');
+
 // Register classes where the names have been changed to fit the autoloader rules
 // @deprecated  4.0
 JLoader::register('JToolBar', JPATH_PLATFORM . '/cms/toolbar/toolbar.php');
diff --git a/libraries/defuse/php-encryption/.travis.yml b/libraries/defuse/php-encryption/.travis.yml
deleted file mode 100644
index 8729b669429fd..0000000000000
--- a/libraries/defuse/php-encryption/.travis.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-language: php
-php:
-    - "5.5"
-    - "5.4"
-    - "5.3"
-    - "5.2"
-# Versions below here are not installed on travis-ci
-#    - "5.1"
-#    - "5.0"
-#    - "4.4"
-#    - "4.3"
-#    - "4.2"
-#    - "4.1"
-#    - "4.0"
-script: ./test.sh
diff --git a/libraries/defuse/php-encryption/Crypto.php b/libraries/defuse/php-encryption/Crypto.php
deleted file mode 100644
index 5147a4ab4a25f..0000000000000
--- a/libraries/defuse/php-encryption/Crypto.php
+++ /dev/null
@@ -1,676 +0,0 @@
-<?php
-
-/*
- * PHP Encryption Library
- * Copyright (c) 2014, Taylor Hornby
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without 
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, 
- * this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation 
- * and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE 
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * Web: https://defuse.ca/secure-php-encryption.htm
- * GitHub: https://github.com/defuse/php-encryption 
- *
- * WARNING: This encryption library is not a silver bullet. It only provides
- * symmetric encryption given a uniformly random key. This means you MUST NOT
- * use an ASCII string like a password as the key parameter, it MUST be
- * a uniformly random key generated by CreateNewRandomKey(). If you want to
- * encrypt something with a password, apply a password key derivation function
- * like PBKDF2 or scrypt with a random salt to generate a key.
- *
- * WARNING: Error handling is very important, especially for crypto code! 
- *
- * How to use this code:
- *
- *     Generating a Key
- *     ----------------
- *       try {
- *           $key = Crypto::CreateNewRandomKey();
- *           // WARNING: Do NOT encode $key with bin2hex() or base64_encode(),
- *           // they may leak the key to the attacker through side channels.
- *       } catch (CryptoTestFailedException $ex) {
- *           die('Cannot safely create a key');
- *       } catch (CannotPerformOperationException $ex) {
- *           die('Cannot safely create a key');
- *       }
- *
- *     Encrypting a Message
- *     --------------------
- *       $message = "ATTACK AT DAWN";
- *       try {
- *           $ciphertext = Crypto::Encrypt($message, $key);
- *       } catch (CryptoTestFailedException $ex) {
- *           die('Cannot safely perform encryption');
- *       } catch (CannotPerformOperationException $ex) {
- *           die('Cannot safely perform decryption');
- *       }
- *
- *     Decrypting a Message
- *     --------------------
- *       try {
- *           $decrypted = Crypto::Decrypt($ciphertext, $key);
- *       } catch (InvalidCiphertextException $ex) { // VERY IMPORTANT
- *           // Either:
- *           //   1. The ciphertext was modified by the attacker,
- *           //   2. The key is wrong, or
- *           //   3. $ciphertext is not a valid ciphertext or was corrupted.
- *           // Assume the worst.
- *           die('DANGER! DANGER! The ciphertext has been tampered with!');
- *       } catch (CryptoTestFailedException $ex) {
- *           die('Cannot safely perform encryption');
- *       } catch (CannotPerformOperationException $ex) {
- *           die('Cannot safely perform decryption');
- *       }
- */
-
-/* 
- * Raised by Decrypt() when one of the following conditions are met:
- *  - The key is wrong.
- *  - The ciphertext is invalid or not in the correct format.
- *  - The attacker modified the ciphertext.
- */
-class InvalidCiphertextException extends Exception {}
-/* If you see these, it means it is NOT SAFE to do encryption on your system. */
-class CannotPerformOperationException extends Exception {}
-class CryptoTestFailedException extends Exception {}
-
-class Crypto
-{
-	// Ciphertext format: [____HMAC____][____IV____][____CIPHERTEXT____].
-
-	/* Do not change these constants! */
-	const CIPHER = MCRYPT_RIJNDAEL_128;
-	const KEY_BYTE_SIZE = 16;
-	const CIPHER_MODE = 'cbc';
-	const HASH_FUNCTION = 'sha256';
-	const MAC_BYTE_SIZE = 32;
-	const ENCRYPTION_INFO = 'DefusePHP|KeyForEncryption';
-	const AUTHENTICATION_INFO = 'DefusePHP|KeyForAuthentication';
-
-	/*
-	 * Use this to generate a random encryption key.
-	 */
-	public static function CreateNewRandomKey()
-	{
-		Crypto::RuntimeTest();
-		return self::SecureRandom(self::KEY_BYTE_SIZE);
-	}
-
-	/*
-	 * Encrypts a message.
-	 * $plaintext is the message to encrypt.
-	 * $key is the encryption key, a value generated by CreateNewRandomKey().
-	 * You MUST catch exceptions thrown by this function. See docs above.
-	 */
-	public static function Encrypt($plaintext, $key)
-	{
-		Crypto::RuntimeTest();
-
-		if (self::our_strlen($key) !== self::KEY_BYTE_SIZE)
-		{
-			throw new CannotPerformOperationException("Bad key.");
-		}
-
-		// Generate a sub-key for encryption.
-		$keysize = self::KEY_BYTE_SIZE;
-		$ekey = self::HKDF(self::HASH_FUNCTION, $key, $keysize, self::ENCRYPTION_INFO);
-
-		// Generate a random initialization vector.
-		self::EnsureFunctionExists("mcrypt_get_iv_size");
-		$ivsize = mcrypt_get_iv_size(self::CIPHER, self::CIPHER_MODE);
-		if ($ivsize === FALSE || $ivsize <= 0) {
-			throw new CannotPerformOperationException();
-		}
-		$iv = self::SecureRandom($ivsize);
-
-		$ciphertext = $iv . self::PlainEncrypt($plaintext, $ekey, $iv);
-
-		// Generate a sub-key for authentication and apply the HMAC.
-		$akey = self::HKDF(self::HASH_FUNCTION, $key, self::KEY_BYTE_SIZE, self::AUTHENTICATION_INFO);
-		$auth = hash_hmac(self::HASH_FUNCTION, $ciphertext, $akey, true);
-		$ciphertext = $auth . $ciphertext;
-
-		return $ciphertext;
-	}
-
-	/*
-	 * Decrypts a ciphertext.
-	 * $ciphertext is the ciphertext to decrypt.
-	 * $key is the key that the ciphertext was encrypted with.
-	 * You MUST catch exceptions thrown by this function. See docs above.
-	 */
-	public static function Decrypt($ciphertext, $key)
-	{
-		Crypto::RuntimeTest();
-
-		// Extract the HMAC from the front of the ciphertext.
-		if (self::our_strlen($ciphertext) <= self::MAC_BYTE_SIZE) {
-			throw new InvalidCiphertextException();
-		}
-		$hmac = self::our_substr($ciphertext, 0, self::MAC_BYTE_SIZE);
-		if ($hmac === FALSE) {
-			throw new CannotPerformOperationException();
-		}
-		$ciphertext = self::our_substr($ciphertext, self::MAC_BYTE_SIZE);
-		if ($ciphertext === FALSE) {
-			throw new CannotPerformOperationException();
-		}
-
-		// Regenerate the same authentication sub-key.
-		$akey = self::HKDF(self::HASH_FUNCTION, $key, self::KEY_BYTE_SIZE, self::AUTHENTICATION_INFO);
-
-		if (self::VerifyHMAC($hmac, $ciphertext, $akey))
-		{
-			// Regenerate the same encryption sub-key.
-			$keysize = self::KEY_BYTE_SIZE;
-			$ekey = self::HKDF(self::HASH_FUNCTION, $key, $keysize, self::ENCRYPTION_INFO);
-
-			// Extract the initialization vector from the ciphertext.
-			self::EnsureFunctionExists("mcrypt_get_iv_size");
-			$ivsize = mcrypt_get_iv_size(self::CIPHER, self::CIPHER_MODE);
-			if ($ivsize === FALSE || $ivsize <= 0) {
-				throw new CannotPerformOperationException();
-			}
-			if (self::our_strlen($ciphertext) <= $ivsize) {
-				throw new InvalidCiphertextException();
-			}
-			$iv = self::our_substr($ciphertext, 0, $ivsize);
-			if ($iv === FALSE) {
-				throw new CannotPerformOperationException();
-			}
-			$ciphertext = self::our_substr($ciphertext, $ivsize);
-			if ($ciphertext === FALSE) {
-				throw new CannotPerformOperationException();
-			}
-			
-			$plaintext = self::PlainDecrypt($ciphertext, $ekey, $iv);
-
-			return $plaintext;
-		}
-		else
-		{
-			/*
-			 * We throw an exception instead of returning FALSE because we want
-			 * a script that doesn't handle this condition to CRASH, instead
-			 * of thinking the ciphertext decrypted to the value FALSE.
-			 */
-			 throw new InvalidCiphertextException();
-		}
-	}
-
-	/*
-	 * Runs tests.
-	 * Raises CannotPerformOperationException or CryptoTestFailedException if
-	 * one of the tests fail. If any tests fails, your system is not capable of
-	 * performing encryption, so make sure you fail safe in that case.
-	 */
-	public static function RuntimeTest()
-	{
-		// 0: Tests haven't been run yet.
-		// 1: Tests have passed.
-		// 2: Tests are running right now.
-		// 3: Tests have failed.
-		static $test_state = 0;
-
-		if ($test_state === 1 || $test_state === 2) {
-			return;
-		}
-
-		try {
-			$test_state = 2;
-			self::AESTestVector();
-			self::HMACTestVector();
-			self::HKDFTestVector();
-
-			self::TestEncryptDecrypt();
-			if (self::our_strlen(Crypto::CreateNewRandomKey()) != self::KEY_BYTE_SIZE) {
-				throw new CryptoTestFailedException();
-			}
-
-			if (self::ENCRYPTION_INFO == self::AUTHENTICATION_INFO) {
-				throw new CryptoTestFailedException();
-			}
-		} catch (CryptoTestFailedException $ex) {
-			// Do this, otherwise it will stay in the "tests are running" state.
-			$test_state = 3;
-			throw $ex;
-		}
-
-		// Change this to '0' make the tests always re-run (for benchmarking).
-		$test_state = 1;
-	}
-
-	/*
-	 * Never call this method directly!
-	 */
-	private static function PlainEncrypt($plaintext, $key, $iv)
-	{
-		self::EnsureFunctionExists("mcrypt_module_open");
-		$crypt = mcrypt_module_open(self::CIPHER, "", self::CIPHER_MODE, "");
-		if ($crypt === FALSE) {
-			throw new CannotPerformOperationException();
-		}
-
-		// Pad the plaintext to a multiple of the block size.
-		self::EnsureFunctionExists("mcrypt_enc_get_block_size");
-		$block = mcrypt_enc_get_block_size($crypt);
-		$pad = $block - (self::our_strlen($plaintext) % $block);
-		$plaintext .= str_repeat(chr($pad), $pad);
-
-		self::EnsureFunctionExists("mcrypt_generic_init");
-		$ret = mcrypt_generic_init($crypt, $key, $iv);
-		if ($ret !== 0) {
-			throw new CannotPerformOperationException();
-		}
-		self::EnsureFunctionExists("mcrypt_generic");
-		$ciphertext = mcrypt_generic($crypt, $plaintext);
-		self::EnsureFunctionExists("mcrypt_generic_deinit");
-		$ret = mcrypt_generic_deinit($crypt);
-		if ($ret !== TRUE) {
-			throw new CannotPerformOperationException();
-		}
-		self::EnsureFunctionExists("mcrypt_module_close");
-		$ret = mcrypt_module_close($crypt);
-		if ($ret !== TRUE) {
-			throw new CannotPerformOperationException();
-		}
-
-		return $ciphertext;
-	}
-
-	/*
-	 * Never call this method directly!
-	 */
-	private static function PlainDecrypt($ciphertext, $key, $iv)
-	{
-		self::EnsureFunctionExists("mcrypt_module_open");
-		$crypt = mcrypt_module_open(self::CIPHER, "", self::CIPHER_MODE, "");
-		if ($crypt === FALSE) {
-			throw new CannotPerformOperationException();
-		}
-
-		self::EnsureFunctionExists("mcrypt_enc_get_block_size");
-		$block = mcrypt_enc_get_block_size($crypt);
-		self::EnsureFunctionExists("mcrypt_generic_init");
-		$ret = mcrypt_generic_init($crypt, $key, $iv);
-		if ($ret !== 0) {
-			throw new CannotPerformOperationException();
-		}
-		self::EnsureFunctionExists("mdecrypt_generic");
-		$plaintext = mdecrypt_generic($crypt, $ciphertext);
-		self::EnsureFunctionExists("mcrypt_generic_deinit");
-		$ret = mcrypt_generic_deinit($crypt);
-		if ($ret !== TRUE) {
-			throw new CannotPerformOperationException();
-		}
-		self::EnsureFunctionExists("mcrypt_module_close");
-		$ret = mcrypt_module_close($crypt);
-		if ($ret !== TRUE) {
-			throw new CannotPerformOperationException();
-		}
-
-		// Remove the padding.
-		$pad = ord($plaintext[self::our_strlen($plaintext) - 1]);
-		if ($pad <= 0 || $pad > $block) {
-			throw new CannotPerformOperationException();
-		}
-		$plaintext = self::our_substr($plaintext, 0, self::our_strlen($plaintext) - $pad);
-		if ($plaintext === FALSE) {
-			throw new CannotPerformOperationException();
-		}
-
-		return $plaintext;
-	}
-
-	/*
-	 * Returns a random binary string of length $octets bytes.
-	 */
-	private static function SecureRandom($octets)
-	{
-		self::EnsureFunctionExists("mcrypt_create_iv");
-		$random = mcrypt_create_iv($octets, MCRYPT_DEV_URANDOM);
-		if ($random === FALSE) {
-			throw new CannotPerformOperationException();
-		} else {
-			return $random;
-		}
-	}
-
-	/*
-	 * Use HKDF to derive multiple keys from one.
-	 * http://tools.ietf.org/html/rfc5869
-	 */
-	private static function HKDF($hash, $ikm, $length, $info = '', $salt = NULL)
-	{
-		// Find the correct digest length as quickly as we can.
-		$digest_length = self::MAC_BYTE_SIZE;
-		if ($hash != self::HASH_FUNCTION) {
-			$digest_length = self::our_strlen(hash_hmac($hash, '', '', true));
-		}
-
-		// Sanity-check the desired output length.
-		if (empty($length) || !is_int($length) ||
-			$length < 0 || $length > 255 * $digest_length) {
-			throw new CannotPerformOperationException();
-		}
-
-		// "if [salt] not provided, is set to a string of HashLen zeroes."
-		if (is_null($salt)) {
-			$salt = str_repeat("\x00", $digest_length);
-		}
-
-		// HKDF-Extract:
-		// PRK = HMAC-Hash(salt, IKM)
-		// The salt is the HMAC key.
-		$prk = hash_hmac($hash, $ikm, $salt, true);
-
-		// HKDF-Expand:
-
-		// This check is useless, but it serves as a reminder to the spec.
-		if (self::our_strlen($prk) < $digest_length) {
-			throw new CannotPerformOperationException();
-		}
-
-		// T(0) = ''
-		$t = '';
-		$last_block = '';
-		for ($block_index = 1; self::our_strlen($t) < $length; $block_index++) {
-			// T(i) = HMAC-Hash(PRK, T(i-1) | info | 0x??)
-			$last_block = hash_hmac(
-				$hash,
-				$last_block . $info . chr($block_index),
-				$prk,
-				true
-			);
-			// T = T(1) | T(2) | T(3) | ... | T(N)
-			$t .= $last_block;
-		}
-
-		// ORM = first L octets of T
-		$orm = self::our_substr($t, 0, $length);
-		if ($orm === FALSE) {
-			throw new CannotPerformOperationException();
-		}
-		return $orm;
-	}
-
-	private static function VerifyHMAC($correct_hmac, $message, $key)
-	{
-		$message_hmac = hash_hmac(self::HASH_FUNCTION, $message, $key, true);
-
-		// We can't just compare the strings with '==', since it would make
-		// timing attacks possible. We could use the XOR-OR constant-time
-		// comparison algorithm, but I'm not sure if that's good enough way up
-		// here in an interpreted language. So we use the method of HMACing the 
-		// strings we want to compare with a random key, then comparing those.
-
-		// NOTE: This leaks information when the strings are not the same
-		// length, but they should always be the same length here. Enforce it:
-		if (self::our_strlen($correct_hmac) !== self::our_strlen($message_hmac)) {
-			throw new CannotPerformOperationException();
-		}
-
-		$blind = self::CreateNewRandomKey();
-		$message_compare = hash_hmac(self::HASH_FUNCTION, $message_hmac, $blind);
-		$correct_compare = hash_hmac(self::HASH_FUNCTION, $correct_hmac, $blind);
-		return $correct_compare === $message_compare;
-	}
-
-	private static function TestEncryptDecrypt()
-	{
-		$key = Crypto::CreateNewRandomKey();
-		$data = "EnCrYpT EvErYThInG\x00\x00";
-
-		// Make sure encrypting then decrypting doesn't change the message.
-		$ciphertext = Crypto::Encrypt($data, $key);
-		try {
-			$decrypted = Crypto::Decrypt($ciphertext, $key);
-		} catch (InvalidCiphertextException $ex) {
-			// It's important to catch this and change it into a 
-			// CryptoTestFailedException, otherwise a test failure could trick
-			// the user into thinking it's just an invalid ciphertext!
-			throw new CryptoTestFailedException();
-		}
-		if($decrypted !== $data)
-		{
-			throw new CryptoTestFailedException();
-		}
-
-		// Modifying the ciphertext: Appending a string.
-		try {
-			Crypto::Decrypt($ciphertext . "a", $key);
-			throw new CryptoTestFailedException();
-		} catch (InvalidCiphertextException $e) { /* expected */ }
-
-		// Modifying the ciphertext: Changing an IV byte.
-		try {
-			$ciphertext[0] = chr((ord($ciphertext[0]) + 1) % 256);
-			Crypto::Decrypt($ciphertext, $key);
-			throw new CryptoTestFailedException();
-		} catch (InvalidCiphertextException $e) { /* expected */ }
-
-		// Decrypting with the wrong key.
-		$key = Crypto::CreateNewRandomKey();
-		$data = "abcdef";
-		$ciphertext = Crypto::Encrypt($data, $key);
-		$wrong_key = Crypto::CreateNewRandomKey();
-		try {
-			Crypto::Decrypt($ciphertext, $wrong_key);
-			throw new CryptoTestFailedException();
-		} catch (InvalidCiphertextException $e) { /* expected */ }
-
-		// Ciphertext too small (shorter than HMAC).
-		$key = Crypto::CreateNewRandomKey();
-		$ciphertext = str_repeat("A", self::MAC_BYTE_SIZE - 1);
-		try {
-			Crypto::Decrypt($ciphertext, $key);
-			throw new CryptoTestFailedException();
-		} catch (InvalidCiphertextException $e) { /* expected */ }
-	}
-
-	private static function HKDFTestVector()
-	{
-		// HKDF test vectors from RFC 5869
-
-		// Test Case 1
-		$ikm = str_repeat("\x0b", 22);
-		$salt = self::hexToBytes("000102030405060708090a0b0c");
-		$info = self::hexToBytes("f0f1f2f3f4f5f6f7f8f9");
-		$length = 42;
-		$okm = self::hexToBytes(
-			"3cb25f25faacd57a90434f64d0362f2a" .
-			"2d2d0a90cf1a5a4c5db02d56ecc4c5bf" .
-			"34007208d5b887185865"
-		);
-		$computed_okm = self::HKDF("sha256", $ikm, $length, $info, $salt);
-		if ($computed_okm !== $okm) {
-			throw new CryptoTestFailedException();
-		}
-
-		// Test Case 7
-		$ikm = str_repeat("\x0c", 22);
-		$length = 42;
-		$okm = self::hexToBytes(
-			"2c91117204d745f3500d636a62f64f0a" .
-			"b3bae548aa53d423b0d1f27ebba6f5e5" .
-			"673a081d70cce7acfc48"
-		);
-		$computed_okm = self::HKDF("sha1", $ikm, $length);
-		if ($computed_okm !== $okm) {
-			throw new CryptoTestFailedException();
-		}
-
-	}
-
-	private static function HMACTestVector()
-	{
-		// HMAC test vector From RFC 4231 (Test Case 1)
-		$key = str_repeat("\x0b", 20);
-		$data = "Hi There";
-		$correct = "b0344c61d8db38535ca8afceaf0bf12b881dc200c9833da726e9376c2e32cff7";
-		if (hash_hmac(self::HASH_FUNCTION, $data, $key) != $correct) {
-			throw new CryptoTestFailedException();
-		}
-	}
-
-	private static function AESTestVector()
-	{
-		// AES CBC mode test vector from NIST SP 800-38A
-		$key = self::hexToBytes("2b7e151628aed2a6abf7158809cf4f3c");
-		$iv = self::hexToBytes("000102030405060708090a0b0c0d0e0f");
-		$plaintext = self::hexToBytes(
-			"6bc1bee22e409f96e93d7e117393172a" . 
-			"ae2d8a571e03ac9c9eb76fac45af8e51" .
-			"30c81c46a35ce411e5fbc1191a0a52ef" .
-			"f69f2445df4f9b17ad2b417be66c3710"
-		);
-		$ciphertext = self::hexToBytes(
-			"7649abac8119b246cee98e9b12e9197d" .
-			"5086cb9b507219ee95db113a917678b2" .
-			"73bed6b8e3c1743b7116e69e22229516" .
-			"3ff1caa1681fac09120eca307586e1a7" .
-			/* Block due to padding. Not from NIST test vector. 
-				Padding Block: 10101010101010101010101010101010
-				Ciphertext:    3ff1caa1681fac09120eca307586e1a7
-						   (+) 2fe1dab1780fbc19021eda206596f1b7 
-						   AES 8cb82807230e1321d3fae00d18cc2012
-			 
-			 */
-			"8cb82807230e1321d3fae00d18cc2012"
-		);
-
-		$computed_ciphertext = self::PlainEncrypt($plaintext, $key, $iv);
-		if ($computed_ciphertext !== $ciphertext) {
-			throw new CryptoTestFailedException();
-		}
-
-		$computed_plaintext = self::PlainDecrypt($ciphertext, $key, $iv);
-		if ($computed_plaintext !== $plaintext) {
-			throw new CryptoTestFailedException();
-		}
-	}
-
-	/* WARNING: Do not call this function on secrets. It creates side channels. */
-	private static function hexToBytes($hex_string)
-	{
-		return pack("H*", $hex_string);
-	}
-
-	private static function EnsureFunctionExists($name)
-	{
-		if (!function_exists($name)) {
-			throw new CannotPerformOperationException();
-		}
-	}
-
-	/*
-	 * We need these strlen() and substr() functions because when
-	 * 'mbstring.func_overload' is set in php.ini, the standard strlen() and
-	 * substr() are replaced by mb_strlen() and mb_substr().
-	 */
-
-	private static function our_strlen($str)
-	{
-		if (function_exists('mb_strlen')) {
-			$length = mb_strlen($str, '8bit');
-			if ($length === FALSE) {
-				throw new CannotPerformOperationException();
-			}
-			return $length;
-		} else {
-			return strlen($str);
-		}
-	}
-
-	private static function our_substr($str, $start, $length = NULL)
-	{
-		if (function_exists('mb_substr'))
-		{
-			// mb_substr($str, 0, NULL, '8bit') returns an empty string on PHP
-			// 5.3, so we have to find the length ourselves.
-			if (!isset($length)) {
-				if ($start >= 0) {
-					$length = self::our_strlen($str) - $start;
-				} else {
-					$length = -$start;
-				}
-			}
-
-			return mb_substr($str, $start, $length, '8bit');
-		}
-
-		// Unlike mb_substr(), substr() doesn't accept NULL for length
-		if (isset($length)) {
-			return substr($str, $start, $length);
-		} else {
-			return substr($str, $start);
-		}
-	}
-
-}
-
-/*
- * We want to catch all uncaught exceptions that come from the Crypto class,
- * since by default, PHP will leak the key in the stack trace from an uncaught
- * exception. This is a really ugly hack, but I think it's justified.
- *
- * Everything up to handler() getting called should be reliable, so this should
- * reliably suppress the stack traces. The rest is just a bonus so that we don't
- * make it impossible to debug other exceptions.
- *
- * This bit of code was adapted from: http://stackoverflow.com/a/7939492
- */
-
-class CryptoExceptionHandler
-{
-	private $rethrow = NULL;
-
-	public function __construct()
-	{
-		set_exception_handler(array($this, "handler"));
-	}
-
-	public function handler($ex)
-	{
-		if (
-			$ex instanceof InvalidCiphertextException ||
-			$ex instanceof CannotPerformOperationException ||
-			$ex instanceof CryptoTestFailedException
-		) {
-			echo "FATAL ERROR: Uncaught crypto exception. Suppresssing output.\n";
-		} else {
-			/* Re-throw the exception in the destructor. */
-			$this->rethrow = $ex;
-		}
-	}
-
-	public function __destruct() {
-		if ($this->rethrow) {
-			throw $this->rethrow;
-		}
-	}
-}
-
-$crypto_exception_handler_object_dont_touch_me = new CryptoExceptionHandler();
-
diff --git a/libraries/defuse/php-encryption/README.md b/libraries/defuse/php-encryption/README.md
deleted file mode 100644
index a564aedf4d8ac..0000000000000
--- a/libraries/defuse/php-encryption/README.md
+++ /dev/null
@@ -1,79 +0,0 @@
-php-encryption
-===============
-
-This is a class for doing symmetric encryption in PHP.
-
-[![Build Status](https://travis-ci.org/defuse/php-encryption.svg?branch=master)](https://travis-ci.org/defuse/php-encryption)
-
-Implementation
---------------
-
-Messages are encrypted with AES-128 in CBC mode and are authenticated with
-HMAC-SHA256 (Encrypt-then-Mac). PKCS7 padding is used to pad the message to
-a multiple of the block size. HKDF is used to split the user-provided key into
-two keys: one for encryption, and the other for authentication. It is
-implemented using the `mcrypt_` and `hash_hmac` functions.
-
-Warning
---------
-
-This is new code, and it hasn't received much review by experts. I have spent
-many hours making it as secure as possible (extensive runtime tests, secure
-coding practices), and auditing it for problems, but I may have missed some
-issues. So be careful. Don't trust it with your life. Check out the open GitHub
-issues for a list of known issues. If you find a problem with this library,
-please report it by opening a GitHub issue.
-
-That said, you're probably much better off using this library than any other
-encryption library written in PHP. 
-
-Philosophy
------------
-
-This library was created after noticing how much insecure PHP encryption code
-there is. I once did a Google search for "php encryption" and found insecure
-code or advice on 9 of the top 10 results.
-
-Encryption is becoming an essential component of modern websites. This library
-aims to fulfil a subset of that need: Authenticated symmetric encryption of
-short strings, given a random key.
-
-This library is developed around several core values:
-
-- Rule #1: Security is prioritized over everything else.
-
-    > Whenever there is a conflict between security and some other property,
-    > security will be favored. For example, the library has runtime tests,
-    > which make it slower, but will hopefully stop it from encrypting stuff
-    > if the platform it's running on is broken.
-
-- Rule #2: It should be difficult to misuse the library.
-
-    > We assume the developers using this library have no experience with
-    > cryptography. We only assume that they know that the "key" is something
-    > you need to encrypt and decrypt the messages, and that it must be
-    > protected. Whenever possible, the library should refuse to encrypt or
-    > decrypt messages when it is not being used correctly.
-
-- Rule #3: The library aims only to be compatible with itself.
-
-    > Other PHP encryption libraries try to support every possible type of
-    > encryption, even the insecure ones (e.g. ECB mode). Because there are so
-    > many options, inexperienced developers must make decisions between
-    > things like "CBC" mode and "ECB" mode, knowing nothing about either one,
-    > which inevitably creates vulnerabilities.
-
-    > This library will only support one secure mode. A developer using this
-    > library will call "encrypt" and "decrypt" not caring about how they are
-    > implemented.
-
-- Rule #4: The library should consist of a single PHP file and nothing more.
-
-    > Some PHP encryption libraries, like libsodium-php [1], are not
-    > straightforward to install and cannot packaged with "just download and
-    > extract" applications. This library will always be just one PHP file
-    > that you can put in your source tree and require().
-
-References:
-
-    [1] https://github.com/jedisct1/libsodium-php
diff --git a/libraries/defuse/php-encryption/benchmark.php b/libraries/defuse/php-encryption/benchmark.php
deleted file mode 100644
index 13ebec5382343..0000000000000
--- a/libraries/defuse/php-encryption/benchmark.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-require_once('Crypto.php');
-
-// Note: By default, the runtime tests are "cached" and not re-executed for
-// every call. To disable this, look at the RuntimeTest() function.
-
-$start = microtime(true);
-for ($i = 0; $i < 1000; $i++) {
-	$key = Crypto::CreateNewRandomKey();
-}
-$end = microtime(true);
-showResults("CreateNewRandomKey()", $start, $end, 1000);
-
-$start = microtime(true);
-for ($i = 0; $i < 100; $i++) {
-	$ciphertext = Crypto::Encrypt(
-		str_repeat("A", 1024*1024), 
-		str_repeat("B", 16)
-	);
-}
-$end = microtime(true);
-showResults("Encrypt(1MB)", $start, $end, 100);
-
-$start = microtime(true);
-for ($i = 0; $i < 1000; $i++) {
-	$ciphertext = Crypto::Encrypt(
-		str_repeat("A", 1024), 
-		str_repeat("B", 16)
-	);
-}
-$end = microtime(true);
-showResults("Encrypt(1KB)", $start, $end, 1000);
-
-function showResults($type, $start, $end, $count)
-{
-	$time = $end - $start;
-	$rate = $count / $time;
-	echo "$type: $rate calls/s\n";
-}
-
-?>
diff --git a/libraries/defuse/php-encryption/example.php b/libraries/defuse/php-encryption/example.php
deleted file mode 100644
index 76b3558ca3b5c..0000000000000
--- a/libraries/defuse/php-encryption/example.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-require_once('Crypto.php');
-  try {
-	  $key = Crypto::CreateNewRandomKey();
-	  // WARNING: Do NOT encode $key with bin2hex() or base64_encode(),
-	  // they may leak the key to the attacker through side channels.
-  } catch (CryptoTestFailedException $ex) {
-	  die('Cannot safely create a key');
-  } catch (CannotPerformOperationException $ex) {
-	  die('Cannot safely create a key');
-  }
-
-  $message = "ATTACK AT DAWN";
-  try {
-	  $ciphertext = Crypto::Encrypt($message, $key);
-  } catch (CryptoTestFailedException $ex) {
-	  die('Cannot safely perform encryption');
-  } catch (CannotPerformOperationException $ex) {
-	  die('Cannot safely perform decryption');
-  }
-
-  try {
-	  $decrypted = Crypto::Decrypt($ciphertext, $key);
-  } catch (InvalidCiphertextException $ex) { // VERY IMPORTANT
-	  // Either:
-	  //   1. The ciphertext was modified by the attacker,
-	  //   2. The key is wrong, or
-	  //   3. $ciphertext is not a valid ciphertext or was corrupted.
-	  // Assume the worst.
-	  die('DANGER! DANGER! The ciphertext has been tampered with!');
-  } catch (CryptoTestFailedException $ex) {
-	  die('Cannot safely perform encryption');
-  } catch (CannotPerformOperationException $ex) {
-	  die('Cannot safely perform decryption');
-  }
-?>
diff --git a/libraries/defuse/php-encryption/test.sh b/libraries/defuse/php-encryption/test.sh
deleted file mode 100644
index d1691e7c6e01f..0000000000000
--- a/libraries/defuse/php-encryption/test.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/bash
-
-echo "Normal"
-echo "--------------------------------------------------"
-php -d mbstring.func_overload=0 tests/runtime.php
-if [ $? -ne 0 ]; then
-    echo "FAIL."
-    exit 1
-fi
-echo "--------------------------------------------------"
-
-echo ""
-
-echo "Multibyte"
-echo "--------------------------------------------------"
-php -d mbstring.func_overload=7 tests/runtime.php
-if [ $? -ne 0 ]; then
-    echo "FAIL."
-    exit 1
-fi
-echo "--------------------------------------------------"
-
-echo ""
-
-if [ -z "$(php Crypto.php)" ]; then
-    echo "PASS: Crypto.php output is empty."
-else
-    echo "FAIL: Crypto.php output is not empty."
-    exit 1
-fi
diff --git a/libraries/defuse/php-encryption/tests/runtime.php b/libraries/defuse/php-encryption/tests/runtime.php
deleted file mode 100644
index 8b6e4aed00c84..0000000000000
--- a/libraries/defuse/php-encryption/tests/runtime.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-// Set the encoding to something more "challenging."
-$ret = mb_internal_encoding('UTF-8');
-if ($ret === FALSE) {
-	echo "Couldn't set encoding.";
-	exit(1);
-}
-
-// Dump out the settings / encoding for future reference.
-$val = ini_get("mbstring.func_overload");
-echo "Settings: \n";
-echo "    func_overload: " . $val . "\n";
-echo "    mb_internal_encoding(): " . mb_internal_encoding() . "\n";
-
-// Perform the tests.
-require_once('Crypto.php');
-try {
-	Crypto::RuntimeTest();
-	echo "TEST PASSED!\n";
-	exit(0);
-} catch (CryptoTestFailedException $ex) {
-	echo "TEST FAILED!\n";
-	var_dump($ex);
-	exit(1);
-} catch (CannotPerformOperationException $ex) {
-	echo "TEST FAILED\n";
-	var_dump($ex);
-	exit(1);
-}
-
-?>
diff --git a/libraries/import.php b/libraries/import.php
index 9bc70d4964c8f..2cd00da2506e9 100644
--- a/libraries/import.php
+++ b/libraries/import.php
@@ -64,6 +64,3 @@
 
 // Register the PasswordHash lib
 JLoader::register('PasswordHash', JPATH_PLATFORM . '/phpass/PasswordHash.php');
-
-// Register the Crypto lib
-JLoader::register('Crypto', JPATH_PLATFORM . '/defuse/php-encryption/Crypto.php');
diff --git a/libraries/php-encryption/Crypto.php b/libraries/php-encryption/Crypto.php
new file mode 100644
index 0000000000000..1d7586f485bc1
--- /dev/null
+++ b/libraries/php-encryption/Crypto.php
@@ -0,0 +1,676 @@
+<?php
+
+/*
+ * PHP Encryption Library
+ * Copyright (c) 2014, Taylor Hornby
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, 
+ * this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation 
+ * and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE 
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*
+ * Web: https://defuse.ca/secure-php-encryption.htm
+ * GitHub: https://github.com/defuse/php-encryption 
+ *
+ * WARNING: This encryption library is not a silver bullet. It only provides
+ * symmetric encryption given a uniformly random key. This means you MUST NOT
+ * use an ASCII string like a password as the key parameter, it MUST be
+ * a uniformly random key generated by CreateNewRandomKey(). If you want to
+ * encrypt something with a password, apply a password key derivation function
+ * like PBKDF2 or scrypt with a random salt to generate a key.
+ *
+ * WARNING: Error handling is very important, especially for crypto code! 
+ *
+ * How to use this code:
+ *
+ *     Generating a Key
+ *     ----------------
+ *       try {
+ *           $key = Crypto::CreateNewRandomKey();
+ *           // WARNING: Do NOT encode $key with bin2hex() or base64_encode(),
+ *           // they may leak the key to the attacker through side channels.
+ *       } catch (CryptoTestFailedException $ex) {
+ *           die('Cannot safely create a key');
+ *       } catch (CannotPerformOperationException $ex) {
+ *           die('Cannot safely create a key');
+ *       }
+ *
+ *     Encrypting a Message
+ *     --------------------
+ *       $message = "ATTACK AT DAWN";
+ *       try {
+ *           $ciphertext = Crypto::Encrypt($message, $key);
+ *       } catch (CryptoTestFailedException $ex) {
+ *           die('Cannot safely perform encryption');
+ *       } catch (CannotPerformOperationException $ex) {
+ *           die('Cannot safely perform decryption');
+ *       }
+ *
+ *     Decrypting a Message
+ *     --------------------
+ *       try {
+ *           $decrypted = Crypto::Decrypt($ciphertext, $key);
+ *       } catch (InvalidCiphertextException $ex) { // VERY IMPORTANT
+ *           // Either:
+ *           //   1. The ciphertext was modified by the attacker,
+ *           //   2. The key is wrong, or
+ *           //   3. $ciphertext is not a valid ciphertext or was corrupted.
+ *           // Assume the worst.
+ *           die('DANGER! DANGER! The ciphertext has been tampered with!');
+ *       } catch (CryptoTestFailedException $ex) {
+ *           die('Cannot safely perform encryption');
+ *       } catch (CannotPerformOperationException $ex) {
+ *           die('Cannot safely perform decryption');
+ *       }
+ */
+
+/* 
+ * Raised by Decrypt() when one of the following conditions are met:
+ *  - The key is wrong.
+ *  - The ciphertext is invalid or not in the correct format.
+ *  - The attacker modified the ciphertext.
+ */
+class InvalidCiphertextException extends Exception {}
+/* If you see these, it means it is NOT SAFE to do encryption on your system. */
+class CannotPerformOperationException extends Exception {}
+class CryptoTestFailedException extends Exception {}
+
+class Crypto
+{
+    // Ciphertext format: [____HMAC____][____IV____][____CIPHERTEXT____].
+
+    /* Do not change these constants! */
+    const CIPHER = MCRYPT_RIJNDAEL_128;
+    const KEY_BYTE_SIZE = 16;
+    const CIPHER_MODE = 'cbc';
+    const HASH_FUNCTION = 'sha256';
+    const MAC_BYTE_SIZE = 32;
+    const ENCRYPTION_INFO = 'DefusePHP|KeyForEncryption';
+    const AUTHENTICATION_INFO = 'DefusePHP|KeyForAuthentication';
+
+    /*
+     * Use this to generate a random encryption key.
+     */
+    public static function CreateNewRandomKey()
+    {
+        Crypto::RuntimeTest();
+        return self::SecureRandom(self::KEY_BYTE_SIZE);
+    }
+
+    /*
+     * Encrypts a message.
+     * $plaintext is the message to encrypt.
+     * $key is the encryption key, a value generated by CreateNewRandomKey().
+     * You MUST catch exceptions thrown by this function. See docs above.
+     */
+    public static function Encrypt($plaintext, $key)
+    {
+        Crypto::RuntimeTest();
+
+        if (self::our_strlen($key) !== self::KEY_BYTE_SIZE)
+        {
+            throw new CannotPerformOperationException("Bad key.");
+        }
+
+        // Generate a sub-key for encryption.
+        $keysize = self::KEY_BYTE_SIZE;
+        $ekey = self::HKDF(self::HASH_FUNCTION, $key, $keysize, self::ENCRYPTION_INFO);
+
+        // Generate a random initialization vector.
+        self::EnsureFunctionExists("mcrypt_get_iv_size");
+        $ivsize = mcrypt_get_iv_size(self::CIPHER, self::CIPHER_MODE);
+        if ($ivsize === FALSE || $ivsize <= 0) {
+            throw new CannotPerformOperationException();
+        }
+        $iv = self::SecureRandom($ivsize);
+
+        $ciphertext = $iv . self::PlainEncrypt($plaintext, $ekey, $iv);
+
+        // Generate a sub-key for authentication and apply the HMAC.
+        $akey = self::HKDF(self::HASH_FUNCTION, $key, self::KEY_BYTE_SIZE, self::AUTHENTICATION_INFO);
+        $auth = hash_hmac(self::HASH_FUNCTION, $ciphertext, $akey, true);
+        $ciphertext = $auth . $ciphertext;
+
+        return $ciphertext;
+    }
+
+    /*
+     * Decrypts a ciphertext.
+     * $ciphertext is the ciphertext to decrypt.
+     * $key is the key that the ciphertext was encrypted with.
+     * You MUST catch exceptions thrown by this function. See docs above.
+     */
+    public static function Decrypt($ciphertext, $key)
+    {
+        Crypto::RuntimeTest();
+
+        // Extract the HMAC from the front of the ciphertext.
+        if (self::our_strlen($ciphertext) <= self::MAC_BYTE_SIZE) {
+            throw new InvalidCiphertextException();
+        }
+        $hmac = self::our_substr($ciphertext, 0, self::MAC_BYTE_SIZE);
+        if ($hmac === FALSE) {
+            throw new CannotPerformOperationException();
+        }
+        $ciphertext = self::our_substr($ciphertext, self::MAC_BYTE_SIZE);
+        if ($ciphertext === FALSE) {
+            throw new CannotPerformOperationException();
+        }
+
+        // Regenerate the same authentication sub-key.
+        $akey = self::HKDF(self::HASH_FUNCTION, $key, self::KEY_BYTE_SIZE, self::AUTHENTICATION_INFO);
+
+        if (self::VerifyHMAC($hmac, $ciphertext, $akey))
+        {
+            // Regenerate the same encryption sub-key.
+            $keysize = self::KEY_BYTE_SIZE;
+            $ekey = self::HKDF(self::HASH_FUNCTION, $key, $keysize, self::ENCRYPTION_INFO);
+
+            // Extract the initialization vector from the ciphertext.
+            self::EnsureFunctionExists("mcrypt_get_iv_size");
+            $ivsize = mcrypt_get_iv_size(self::CIPHER, self::CIPHER_MODE);
+            if ($ivsize === FALSE || $ivsize <= 0) {
+                throw new CannotPerformOperationException();
+            }
+            if (self::our_strlen($ciphertext) <= $ivsize) {
+                throw new InvalidCiphertextException();
+            }
+            $iv = self::our_substr($ciphertext, 0, $ivsize);
+            if ($iv === FALSE) {
+                throw new CannotPerformOperationException();
+            }
+            $ciphertext = self::our_substr($ciphertext, $ivsize);
+            if ($ciphertext === FALSE) {
+                throw new CannotPerformOperationException();
+            }
+            
+            $plaintext = self::PlainDecrypt($ciphertext, $ekey, $iv);
+
+            return $plaintext;
+        }
+        else
+        {
+            /*
+             * We throw an exception instead of returning FALSE because we want
+             * a script that doesn't handle this condition to CRASH, instead
+             * of thinking the ciphertext decrypted to the value FALSE.
+             */
+             throw new InvalidCiphertextException();
+        }
+    }
+
+    /*
+     * Runs tests.
+     * Raises CannotPerformOperationException or CryptoTestFailedException if
+     * one of the tests fail. If any tests fails, your system is not capable of
+     * performing encryption, so make sure you fail safe in that case.
+     */
+    public static function RuntimeTest()
+    {
+        // 0: Tests haven't been run yet.
+        // 1: Tests have passed.
+        // 2: Tests are running right now.
+        // 3: Tests have failed.
+        static $test_state = 0;
+
+        if ($test_state === 1 || $test_state === 2) {
+            return;
+        }
+
+        try {
+            $test_state = 2;
+            self::AESTestVector();
+            self::HMACTestVector();
+            self::HKDFTestVector();
+
+            self::TestEncryptDecrypt();
+            if (self::our_strlen(Crypto::CreateNewRandomKey()) != self::KEY_BYTE_SIZE) {
+                throw new CryptoTestFailedException();
+            }
+
+            if (self::ENCRYPTION_INFO == self::AUTHENTICATION_INFO) {
+                throw new CryptoTestFailedException();
+            }
+        } catch (CryptoTestFailedException $ex) {
+            // Do this, otherwise it will stay in the "tests are running" state.
+            $test_state = 3;
+            throw $ex;
+        }
+
+        // Change this to '0' make the tests always re-run (for benchmarking).
+        $test_state = 1;
+    }
+
+    /*
+     * Never call this method directly!
+     */
+    private static function PlainEncrypt($plaintext, $key, $iv)
+    {
+        self::EnsureFunctionExists("mcrypt_module_open");
+        $crypt = mcrypt_module_open(self::CIPHER, "", self::CIPHER_MODE, "");
+        if ($crypt === FALSE) {
+            throw new CannotPerformOperationException();
+        }
+
+        // Pad the plaintext to a multiple of the block size.
+        self::EnsureFunctionExists("mcrypt_enc_get_block_size");
+        $block = mcrypt_enc_get_block_size($crypt);
+        $pad = $block - (self::our_strlen($plaintext) % $block);
+        $plaintext .= str_repeat(chr($pad), $pad);
+
+        self::EnsureFunctionExists("mcrypt_generic_init");
+        $ret = mcrypt_generic_init($crypt, $key, $iv);
+        if ($ret !== 0) {
+            throw new CannotPerformOperationException();
+        }
+        self::EnsureFunctionExists("mcrypt_generic");
+        $ciphertext = mcrypt_generic($crypt, $plaintext);
+        self::EnsureFunctionExists("mcrypt_generic_deinit");
+        $ret = mcrypt_generic_deinit($crypt);
+        if ($ret !== TRUE) {
+            throw new CannotPerformOperationException();
+        }
+        self::EnsureFunctionExists("mcrypt_module_close");
+        $ret = mcrypt_module_close($crypt);
+        if ($ret !== TRUE) {
+            throw new CannotPerformOperationException();
+        }
+
+        return $ciphertext;
+    }
+
+    /*
+     * Never call this method directly!
+     */
+    private static function PlainDecrypt($ciphertext, $key, $iv)
+    {
+        self::EnsureFunctionExists("mcrypt_module_open");
+        $crypt = mcrypt_module_open(self::CIPHER, "", self::CIPHER_MODE, "");
+        if ($crypt === FALSE) {
+            throw new CannotPerformOperationException();
+        }
+
+        self::EnsureFunctionExists("mcrypt_enc_get_block_size");
+        $block = mcrypt_enc_get_block_size($crypt);
+        self::EnsureFunctionExists("mcrypt_generic_init");
+        $ret = mcrypt_generic_init($crypt, $key, $iv);
+        if ($ret !== 0) {
+            throw new CannotPerformOperationException();
+        }
+        self::EnsureFunctionExists("mdecrypt_generic");
+        $plaintext = mdecrypt_generic($crypt, $ciphertext);
+        self::EnsureFunctionExists("mcrypt_generic_deinit");
+        $ret = mcrypt_generic_deinit($crypt);
+        if ($ret !== TRUE) {
+            throw new CannotPerformOperationException();
+        }
+        self::EnsureFunctionExists("mcrypt_module_close");
+        $ret = mcrypt_module_close($crypt);
+        if ($ret !== TRUE) {
+            throw new CannotPerformOperationException();
+        }
+
+        // Remove the padding.
+        $pad = ord($plaintext[self::our_strlen($plaintext) - 1]);
+        if ($pad <= 0 || $pad > $block) {
+            throw new CannotPerformOperationException();
+        }
+        $plaintext = self::our_substr($plaintext, 0, self::our_strlen($plaintext) - $pad);
+        if ($plaintext === FALSE) {
+            throw new CannotPerformOperationException();
+        }
+
+        return $plaintext;
+    }
+
+    /*
+     * Returns a random binary string of length $octets bytes.
+     */
+    private static function SecureRandom($octets)
+    {
+        self::EnsureFunctionExists("mcrypt_create_iv");
+        $random = mcrypt_create_iv($octets, MCRYPT_DEV_URANDOM);
+        if ($random === FALSE) {
+            throw new CannotPerformOperationException();
+        } else {
+            return $random;
+        }
+    }
+
+    /*
+     * Use HKDF to derive multiple keys from one.
+     * http://tools.ietf.org/html/rfc5869
+     */
+    private static function HKDF($hash, $ikm, $length, $info = '', $salt = NULL)
+    {
+        // Find the correct digest length as quickly as we can.
+        $digest_length = self::MAC_BYTE_SIZE;
+        if ($hash != self::HASH_FUNCTION) {
+            $digest_length = self::our_strlen(hash_hmac($hash, '', '', true));
+        }
+
+        // Sanity-check the desired output length.
+        if (empty($length) || !is_int($length) ||
+            $length < 0 || $length > 255 * $digest_length) {
+            throw new CannotPerformOperationException();
+        }
+
+        // "if [salt] not provided, is set to a string of HashLen zeroes."
+        if (is_null($salt)) {
+            $salt = str_repeat("\x00", $digest_length);
+        }
+
+        // HKDF-Extract:
+        // PRK = HMAC-Hash(salt, IKM)
+        // The salt is the HMAC key.
+        $prk = hash_hmac($hash, $ikm, $salt, true);
+
+        // HKDF-Expand:
+
+        // This check is useless, but it serves as a reminder to the spec.
+        if (self::our_strlen($prk) < $digest_length) {
+            throw new CannotPerformOperationException();
+        }
+
+        // T(0) = ''
+        $t = '';
+        $last_block = '';
+        for ($block_index = 1; self::our_strlen($t) < $length; $block_index++) {
+            // T(i) = HMAC-Hash(PRK, T(i-1) | info | 0x??)
+            $last_block = hash_hmac(
+                $hash,
+                $last_block . $info . chr($block_index),
+                $prk,
+                true
+            );
+            // T = T(1) | T(2) | T(3) | ... | T(N)
+            $t .= $last_block;
+        }
+
+        // ORM = first L octets of T
+        $orm = self::our_substr($t, 0, $length);
+        if ($orm === FALSE) {
+            throw new CannotPerformOperationException();
+        }
+        return $orm;
+    }
+
+    private static function VerifyHMAC($correct_hmac, $message, $key)
+    {
+        $message_hmac = hash_hmac(self::HASH_FUNCTION, $message, $key, true);
+
+        // We can't just compare the strings with '==', since it would make
+        // timing attacks possible. We could use the XOR-OR constant-time
+        // comparison algorithm, but I'm not sure if that's good enough way up
+        // here in an interpreted language. So we use the method of HMACing the 
+        // strings we want to compare with a random key, then comparing those.
+
+        // NOTE: This leaks information when the strings are not the same
+        // length, but they should always be the same length here. Enforce it:
+        if (self::our_strlen($correct_hmac) !== self::our_strlen($message_hmac)) {
+            throw new CannotPerformOperationException();
+        }
+
+        $blind = self::CreateNewRandomKey();
+        $message_compare = hash_hmac(self::HASH_FUNCTION, $message_hmac, $blind);
+        $correct_compare = hash_hmac(self::HASH_FUNCTION, $correct_hmac, $blind);
+        return $correct_compare === $message_compare;
+    }
+
+    private static function TestEncryptDecrypt()
+    {
+        $key = Crypto::CreateNewRandomKey();
+        $data = "EnCrYpT EvErYThInG\x00\x00";
+
+        // Make sure encrypting then decrypting doesn't change the message.
+        $ciphertext = Crypto::Encrypt($data, $key);
+        try {
+            $decrypted = Crypto::Decrypt($ciphertext, $key);
+        } catch (InvalidCiphertextException $ex) {
+            // It's important to catch this and change it into a 
+            // CryptoTestFailedException, otherwise a test failure could trick
+            // the user into thinking it's just an invalid ciphertext!
+            throw new CryptoTestFailedException();
+        }
+        if($decrypted !== $data)
+        {
+            throw new CryptoTestFailedException();
+        }
+
+        // Modifying the ciphertext: Appending a string.
+        try {
+            Crypto::Decrypt($ciphertext . "a", $key);
+            throw new CryptoTestFailedException();
+        } catch (InvalidCiphertextException $e) { /* expected */ }
+
+        // Modifying the ciphertext: Changing an IV byte.
+        try {
+            $ciphertext[0] = chr((ord($ciphertext[0]) + 1) % 256);
+            Crypto::Decrypt($ciphertext, $key);
+            throw new CryptoTestFailedException();
+        } catch (InvalidCiphertextException $e) { /* expected */ }
+
+        // Decrypting with the wrong key.
+        $key = Crypto::CreateNewRandomKey();
+        $data = "abcdef";
+        $ciphertext = Crypto::Encrypt($data, $key);
+        $wrong_key = Crypto::CreateNewRandomKey();
+        try {
+            Crypto::Decrypt($ciphertext, $wrong_key);
+            throw new CryptoTestFailedException();
+        } catch (InvalidCiphertextException $e) { /* expected */ }
+
+        // Ciphertext too small (shorter than HMAC).
+        $key = Crypto::CreateNewRandomKey();
+        $ciphertext = str_repeat("A", self::MAC_BYTE_SIZE - 1);
+        try {
+            Crypto::Decrypt($ciphertext, $key);
+            throw new CryptoTestFailedException();
+        } catch (InvalidCiphertextException $e) { /* expected */ }
+    }
+
+    private static function HKDFTestVector()
+    {
+        // HKDF test vectors from RFC 5869
+
+        // Test Case 1
+        $ikm = str_repeat("\x0b", 22);
+        $salt = self::hexToBytes("000102030405060708090a0b0c");
+        $info = self::hexToBytes("f0f1f2f3f4f5f6f7f8f9");
+        $length = 42;
+        $okm = self::hexToBytes(
+            "3cb25f25faacd57a90434f64d0362f2a" .
+            "2d2d0a90cf1a5a4c5db02d56ecc4c5bf" .
+            "34007208d5b887185865"
+        );
+        $computed_okm = self::HKDF("sha256", $ikm, $length, $info, $salt);
+        if ($computed_okm !== $okm) {
+            throw new CryptoTestFailedException();
+        }
+
+        // Test Case 7
+        $ikm = str_repeat("\x0c", 22);
+        $length = 42;
+        $okm = self::hexToBytes(
+            "2c91117204d745f3500d636a62f64f0a" .
+            "b3bae548aa53d423b0d1f27ebba6f5e5" .
+            "673a081d70cce7acfc48"
+        );
+        $computed_okm = self::HKDF("sha1", $ikm, $length);
+        if ($computed_okm !== $okm) {
+            throw new CryptoTestFailedException();
+        }
+
+    }
+
+    private static function HMACTestVector()
+    {
+        // HMAC test vector From RFC 4231 (Test Case 1)
+        $key = str_repeat("\x0b", 20);
+        $data = "Hi There";
+        $correct = "b0344c61d8db38535ca8afceaf0bf12b881dc200c9833da726e9376c2e32cff7";
+        if (hash_hmac(self::HASH_FUNCTION, $data, $key) != $correct) {
+            throw new CryptoTestFailedException();
+        }
+    }
+
+    private static function AESTestVector()
+    {
+        // AES CBC mode test vector from NIST SP 800-38A
+        $key = self::hexToBytes("2b7e151628aed2a6abf7158809cf4f3c");
+        $iv = self::hexToBytes("000102030405060708090a0b0c0d0e0f");
+        $plaintext = self::hexToBytes(
+            "6bc1bee22e409f96e93d7e117393172a" . 
+            "ae2d8a571e03ac9c9eb76fac45af8e51" .
+            "30c81c46a35ce411e5fbc1191a0a52ef" .
+            "f69f2445df4f9b17ad2b417be66c3710"
+        );
+        $ciphertext = self::hexToBytes(
+            "7649abac8119b246cee98e9b12e9197d" .
+            "5086cb9b507219ee95db113a917678b2" .
+            "73bed6b8e3c1743b7116e69e22229516" .
+            "3ff1caa1681fac09120eca307586e1a7" .
+            /* Block due to padding. Not from NIST test vector. 
+                Padding Block: 10101010101010101010101010101010
+                Ciphertext:    3ff1caa1681fac09120eca307586e1a7
+                           (+) 2fe1dab1780fbc19021eda206596f1b7 
+                           AES 8cb82807230e1321d3fae00d18cc2012
+             
+             */
+            "8cb82807230e1321d3fae00d18cc2012"
+        );
+
+        $computed_ciphertext = self::PlainEncrypt($plaintext, $key, $iv);
+        if ($computed_ciphertext !== $ciphertext) {
+            throw new CryptoTestFailedException();
+        }
+
+        $computed_plaintext = self::PlainDecrypt($ciphertext, $key, $iv);
+        if ($computed_plaintext !== $plaintext) {
+            throw new CryptoTestFailedException();
+        }
+    }
+
+    /* WARNING: Do not call this function on secrets. It creates side channels. */
+    private static function hexToBytes($hex_string)
+    {
+        return pack("H*", $hex_string);
+    }
+
+    private static function EnsureFunctionExists($name)
+    {
+        if (!function_exists($name)) {
+            throw new CannotPerformOperationException();
+        }
+    }
+
+    /*
+     * We need these strlen() and substr() functions because when
+     * 'mbstring.func_overload' is set in php.ini, the standard strlen() and
+     * substr() are replaced by mb_strlen() and mb_substr().
+     */
+
+    private static function our_strlen($str)
+    {
+        if (function_exists('mb_strlen')) {
+            $length = mb_strlen($str, '8bit');
+            if ($length === FALSE) {
+                throw new CannotPerformOperationException();
+            }
+            return $length;
+        } else {
+            return strlen($str);
+        }
+    }
+
+    private static function our_substr($str, $start, $length = NULL)
+    {
+        if (function_exists('mb_substr'))
+        {
+            // mb_substr($str, 0, NULL, '8bit') returns an empty string on PHP
+            // 5.3, so we have to find the length ourselves.
+            if (!isset($length)) {
+                if ($start >= 0) {
+                    $length = self::our_strlen($str) - $start;
+                } else {
+                    $length = -$start;
+                }
+            }
+
+            return mb_substr($str, $start, $length, '8bit');
+        }
+
+        // Unlike mb_substr(), substr() doesn't accept NULL for length
+        if (isset($length)) {
+            return substr($str, $start, $length);
+        } else {
+            return substr($str, $start);
+        }
+    }
+
+}
+
+/*
+ * We want to catch all uncaught exceptions that come from the Crypto class,
+ * since by default, PHP will leak the key in the stack trace from an uncaught
+ * exception. This is a really ugly hack, but I think it's justified.
+ *
+ * Everything up to handler() getting called should be reliable, so this should
+ * reliably suppress the stack traces. The rest is just a bonus so that we don't
+ * make it impossible to debug other exceptions.
+ *
+ * This bit of code was adapted from: http://stackoverflow.com/a/7939492
+ */
+
+class CryptoExceptionHandler
+{
+    private $rethrow = NULL;
+
+    public function __construct()
+    {
+        set_exception_handler(array($this, "handler"));
+    }
+
+    public function handler($ex)
+    {
+        if (
+            $ex instanceof InvalidCiphertextException ||
+            $ex instanceof CannotPerformOperationException ||
+            $ex instanceof CryptoTestFailedException
+        ) {
+            echo "FATAL ERROR: Uncaught crypto exception. Suppresssing output.\n";
+        } else {
+            /* Re-throw the exception in the destructor. */
+            $this->rethrow = $ex;
+        }
+    }
+
+    public function __destruct() {
+        if ($this->rethrow) {
+            throw $this->rethrow;
+        }
+    }
+}
+
+$crypto_exception_handler_object_dont_touch_me = new CryptoExceptionHandler();
+

From b501c89443329d00c33d5eb4d33b27e64cbc81e4 Mon Sep 17 00:00:00 2001
From: Michael Babker <mbabker@flbab.com>
Date: Thu, 12 Nov 2015 19:47:06 -0500
Subject: [PATCH 045/176] Add an implementation of JCryptCipher using the
 Crypto class

---
 libraries/joomla/crypt/cipher/crypto.php      | 125 ++++++++++++++++++
 .../crypt/cipher/JCryptCipherCryptoTest.php   |  99 ++++++++++++++
 2 files changed, 224 insertions(+)
 create mode 100644 libraries/joomla/crypt/cipher/crypto.php
 create mode 100644 tests/unit/suites/libraries/joomla/crypt/cipher/JCryptCipherCryptoTest.php

diff --git a/libraries/joomla/crypt/cipher/crypto.php b/libraries/joomla/crypt/cipher/crypto.php
new file mode 100644
index 0000000000000..18011c11edaa0
--- /dev/null
+++ b/libraries/joomla/crypt/cipher/crypto.php
@@ -0,0 +1,125 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Crypt
+ *
+ * @copyright   Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * JCrypt cipher for encryption, decryption and key generation via the php-encryption library.
+ *
+ * @since  3.5
+ */
+class JCryptCipherCrypto implements JCryptCipher
+{
+	/**
+	 * Method to decrypt a data string.
+	 *
+	 * @param   string     $data  The encrypted string to decrypt.
+	 * @param   JCryptKey  $key   The key object to use for decryption.
+	 *
+	 * @return  string  The decrypted data string.
+	 *
+	 * @since   3.5
+	 * @throws  RuntimeException
+	 */
+	public function decrypt($data, JCryptKey $key)
+	{
+		// Validate key.
+		if ($key->type != 'crypto')
+		{
+			throw new InvalidArgumentException('Invalid key of type: ' . $key->type . '.  Expected crypto.');
+		}
+
+		// Decrypt the data.
+		try
+		{
+			return Crypto::Decrypt($data, $key->public);
+		}
+		catch (InvalidCiphertextException $ex)
+		{
+			throw new RuntimeException('DANGER! DANGER! The ciphertext has been tampered with!', $ex->getCode(), $ex);
+		}
+		catch (CryptoTestFailedException $ex)
+		{
+			throw new RuntimeException('Cannot safely perform decryption', $ex->getCode(), $ex);
+		}
+		catch (CannotPerformOperationException $ex)
+		{
+			throw new RuntimeException('Cannot safely perform decryption', $ex->getCode(), $ex);
+		}
+	}
+
+	/**
+	 * Method to encrypt a data string.
+	 *
+	 * @param   string     $data  The data string to encrypt.
+	 * @param   JCryptKey  $key   The key object to use for encryption.
+	 *
+	 * @return  string  The encrypted data string.
+	 *
+	 * @since   3.5
+	 * @throws  RuntimeException
+	 */
+	public function encrypt($data, JCryptKey $key)
+	{
+		// Validate key.
+		if ($key->type != 'crypto')
+		{
+			throw new InvalidArgumentException('Invalid key of type: ' . $key->type . '.  Expected crypto.');
+		}
+
+		// Encrypt the data.
+		try
+		{
+			return Crypto::Encrypt($data, $key->public);
+		}
+		catch (CryptoTestFailedException $ex)
+		{
+			throw new RuntimeException('Cannot safely perform encryption', $ex->getCode(), $ex);
+		}
+		catch (CannotPerformOperationException $ex)
+		{
+			throw new RuntimeException('Cannot safely perform encryption', $ex->getCode(), $ex);
+		}
+	}
+
+	/**
+	 * Method to generate a new encryption key object.
+	 *
+	 * @param   array  $options  Key generation options.
+	 *
+	 * @return  JCryptKey
+	 *
+	 * @since   3.5
+	 * @throws  RuntimeException
+	 */
+	public function generateKey(array $options = array())
+	{
+		// Create the new encryption key object.
+		$key = new JCryptKey('crypto');
+
+		// Generate the encryption key.
+		try
+		{
+			$key->public = Crypto::CreateNewRandomKey();
+		}
+		catch (CryptoTestFailedException $ex)
+		{
+			throw new RuntimeException('Cannot safely create a key', $ex->getCode(), $ex);
+		}
+		catch (CannotPerformOperationException $ex)
+		{
+			throw new RuntimeException('Cannot safely create a key', $ex->getCode(), $ex);
+		}
+
+		// Explicitly flag the private as unused in this cipher.
+		$key->private = 'unused';
+
+		return $key;
+	}
+}
diff --git a/tests/unit/suites/libraries/joomla/crypt/cipher/JCryptCipherCryptoTest.php b/tests/unit/suites/libraries/joomla/crypt/cipher/JCryptCipherCryptoTest.php
new file mode 100644
index 0000000000000..8db6ba2c1a986
--- /dev/null
+++ b/tests/unit/suites/libraries/joomla/crypt/cipher/JCryptCipherCryptoTest.php
@@ -0,0 +1,99 @@
+<?php
+/**
+ * @package     Joomla.UnitTest
+ * @subpackage  Crypt
+ *
+ * @copyright   Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+/**
+ * Test class for JCryptCipherCrypto.
+ */
+class JCryptCipherCryptoTest extends TestCase
+{
+	/**
+	 * This method is called before the first test of this test class is run.
+	 *
+	 * @return  void
+	 */
+	public static function setUpBeforeClass()
+	{
+		// Only run the test if the environment supports it.
+		try
+		{
+			Crypto::RuntimeTest();
+		}
+		catch (CryptoTestFailedException $e)
+		{
+			self::markTestSkipped('The environment cannot safely perform encryption with this cipher.');
+		}
+	}
+
+	/**
+	 * Test data for processing
+	 *
+	 * @return  array
+	 */
+	public function dataStrings()
+	{
+		return array(
+			array('c-;3-(Is>{DJzOHMCv_<#yKuN/G`/Us{GkgicWG$M|HW;kI0BVZ^|FY/"Obt53?PNaWwhmRtH;lWkWE4vlG5CIFA!abu&F=Xo#Qw}gAp3;GL\'k])%D}C+W&ne6_F$3P5'),
+			array('Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. ' .
+					'Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor ' .
+					'in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt ' .
+					'in culpa qui officia deserunt mollit anim id est laborum.'),
+			array('لا أحد يحب الألم بذاته، يسعى ورائه أو يبتغيه، ببساطة لأنه الألم...'),
+			array('Широкая электрификация южных губерний даст мощный толчок подъёму сельского хозяйства'),
+			array('The quick brown fox jumps over the lazy dog.')
+		);
+	}
+
+	/**
+	 * @testdox  Validates data is encrypted and decrypted correctly
+	 *
+	 * @param   string  $data  The decrypted data to validate
+	 *
+	 * @covers        JCryptCipherCrypto::decrypt
+	 * @covers        JCryptCipherCrypto::encrypt
+	 * @dataProvider  dataStrings
+	 */
+	public function testDataEncryptionAndDecryption($data)
+	{
+		$cipher = new JCryptCipherCrypto;
+		$key    = $cipher->generateKey();
+
+		$encrypted = $cipher->encrypt($data, $key);
+
+		// Assert that the encrypted value is not the same as the clear text value.
+		$this->assertNotSame($data, $encrypted);
+
+		$decrypted = $cipher->decrypt($encrypted, $key);
+
+		// Assert the decrypted string is the same value we started with
+		$this->assertSame($data, $decrypted);
+	}
+
+	/**
+	 * @testdox  Validates keys are correctly generated
+	 *
+	 * @covers   JCryptCipherCrypto::generateKey
+	 */
+	public function testGenerateKey()
+	{
+		$cipher = new JCryptCipherCrypto;
+		$key    = $cipher->generateKey();
+
+		// Assert that the key is the correct type.
+		$this->assertInstanceOf('JCryptKey', $key);
+
+		// Assert the private key is our expected value.
+		$this->assertSame('unused', $key->private);
+
+		// Assert the public key is the expected length
+		$this->assertSame(Crypto::KEY_BYTE_SIZE, JCrypt::safeStrlen($key->public));
+
+		// Assert the key is of the correct type.
+		$this->assertAttributeEquals('crypto', 'type', $key);
+	}
+}

From a05ac75a9fa7858742ff6c10d26907f44628dc9d Mon Sep 17 00:00:00 2001
From: Scott <scott@paragonie.com>
Date: Fri, 13 Nov 2015 00:15:05 -0500
Subject: [PATCH 046/176] Update README.md

---
 libraries/joomla/crypt/README.md | 44 +++++++++++++++++++++++++++-----
 1 file changed, 38 insertions(+), 6 deletions(-)

diff --git a/libraries/joomla/crypt/README.md b/libraries/joomla/crypt/README.md
index 17963657ea371..dd659dc024006 100644
--- a/libraries/joomla/crypt/README.md
+++ b/libraries/joomla/crypt/README.md
@@ -1,10 +1,6 @@
 # Important Security Information
 
-JCrypt is being deprecated in Joomla 4 and is **not generally considered secure**.
-Please don't use it for any of your projects.
-
-Use [defuse/php-encryption](https://github.com/defuse/php-encryption) instead.
-We bundle version 1.1 as of Joomla 3.5.0.
+If you're going to use JCrypt in any of your plugins, make *sure* you use **JCryptCipherCrypt**; it's the only one that's cryptographically secure. (It's [version 1.1 of Defuse Security's encryption library](https://github.com/defuse/php-encryption)).
 
 ```php
 $message = 'Sensitive field';
@@ -13,4 +9,40 @@ $ciphertext = Crypto::encrypt($message, $key);
 $decrypted = Crypto::decrypt($ciphertext, $key);
 ```
 
-If you continue to use JCrypt, you do so *at your own risk*.
\ No newline at end of file
+## Avoid these Ciphers if Possible
+
+* `JcryptCipher3Des`
+* `JcryptCipherBlowfish`
+* `JcryptCipherMcrypt`
+* `JcryptCipherRijndael256`
+
+All of these ciphers are vulnerable to something called a [chosen-ciphertext attack](https://en.wikipedia.org/wiki/Chosen-ciphertext_attack). The only provable way to prevent chosen-ciphertext attacks is to [use uthenticated encryption](https://paragonie.com/blog/2015/05/using-encryption-and-authentication-correctly), preferrably in an [Encrypt-then-MAC construction](http://www.thoughtcrime.org/blog/the-cryptographic-doom-principle/).
+
+The only JCrypt cipher that meets the *authenticated encryption* criteria is **`JCryptCipherCrypto`**.
+
+## Absolutely Avoid JCryptCipherSimple
+
+`JCryptCipherSimple` is deprecated and will be removed in Joomla 4. It's vulnerable to a known plaintext attack: If you know any information about the plaintext (e.g. the first character is '<'), an attacker can recover bits of the encryption key with ease.
+
+If an attacker can influence the message, they can actually steal your encryption key. Here's how:
+
+1. Feed `str_repeat('A', 256)` into your application, towards `JCryptCipherSimple`.
+2. Observe the output of the cipher (the ciphertext).
+3. Run it through this code:
+
+```php
+function recoverJcryptCipherSimpleKey($ciphertext, $knownPlaintext)
+{
+    $key = '';
+    for ($i = 0; $i < strlen($knownPlaintext); ++$i) {
+      $key.= chr(ord($ciphertext[$i]) ^ ord($knownPlaintext[$i]));
+    }
+}
+
+$key = recoverJcryptCipherSimpleKey(
+    $someEncryptedTextOutput,
+    str_repeat('A', 256)
+);
+```
+
+Given how trivial it is to steal the encryption key from this cipher, you absolutely should not use it.

From cb28dd9a8d5f21b16c73ebd8af29ad381d834561 Mon Sep 17 00:00:00 2001
From: Scott <scott@paragonie.com>
Date: Fri, 13 Nov 2015 00:19:00 -0500
Subject: [PATCH 047/176] Actually update the example code

(The rest of the stuff needed to be updated *anyway*, but I totally forgot to do my stated reason for updating this in the first place.)
---
 libraries/joomla/crypt/README.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/libraries/joomla/crypt/README.md b/libraries/joomla/crypt/README.md
index dd659dc024006..4e2ecd2a29549 100644
--- a/libraries/joomla/crypt/README.md
+++ b/libraries/joomla/crypt/README.md
@@ -3,10 +3,10 @@
 If you're going to use JCrypt in any of your plugins, make *sure* you use **JCryptCipherCrypt**; it's the only one that's cryptographically secure. (It's [version 1.1 of Defuse Security's encryption library](https://github.com/defuse/php-encryption)).
 
 ```php
-$message = 'Sensitive field';
-$key = Crypto::CreateNewRandomKey(); // Store this for long-term use
-$ciphertext = Crypto::encrypt($message, $key);
-$decrypted = Crypto::decrypt($ciphertext, $key);
+$cipher = new JCryptCipherCrypto();
+$key = $cipher->generateKey(); // Store this for long-term use
+$ciphertext = $cipher->encrypt($message, $key);
+$decrypted = $cipher->decrypt($ciphertext, $key);
 ```
 
 ## Avoid these Ciphers if Possible

From 9e1c4f60c97cfb074a32c70fb057b83c3ab56240 Mon Sep 17 00:00:00 2001
From: Scott <scott@paragonie.com>
Date: Fri, 13 Nov 2015 00:19:22 -0500
Subject: [PATCH 048/176] Fix typo.

---
 libraries/joomla/crypt/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/joomla/crypt/README.md b/libraries/joomla/crypt/README.md
index 4e2ecd2a29549..4fa7c0d2b2ecd 100644
--- a/libraries/joomla/crypt/README.md
+++ b/libraries/joomla/crypt/README.md
@@ -16,7 +16,7 @@ $decrypted = $cipher->decrypt($ciphertext, $key);
 * `JcryptCipherMcrypt`
 * `JcryptCipherRijndael256`
 
-All of these ciphers are vulnerable to something called a [chosen-ciphertext attack](https://en.wikipedia.org/wiki/Chosen-ciphertext_attack). The only provable way to prevent chosen-ciphertext attacks is to [use uthenticated encryption](https://paragonie.com/blog/2015/05/using-encryption-and-authentication-correctly), preferrably in an [Encrypt-then-MAC construction](http://www.thoughtcrime.org/blog/the-cryptographic-doom-principle/).
+All of these ciphers are vulnerable to something called a [chosen-ciphertext attack](https://en.wikipedia.org/wiki/Chosen-ciphertext_attack). The only provable way to prevent chosen-ciphertext attacks is to [use authenticated encryption](https://paragonie.com/blog/2015/05/using-encryption-and-authentication-correctly), preferrably in an [Encrypt-then-MAC construction](http://www.thoughtcrime.org/blog/the-cryptographic-doom-principle/).
 
 The only JCrypt cipher that meets the *authenticated encryption* criteria is **`JCryptCipherCrypto`**.
 

From 51d5ede3aecc60031a6ffdef4bd758d4cbc6d6e4 Mon Sep 17 00:00:00 2001
From: Nicola Galgano <extensions4joomla@gmail.com>
Date: Fri, 13 Nov 2015 08:16:39 +0100
Subject: [PATCH 049/176] travis fix

added blank line before comment
---
 plugins/system/debug/debug.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/system/debug/debug.php b/plugins/system/debug/debug.php
index 3e4ec7090c69b..60d4d81402160 100644
--- a/plugins/system/debug/debug.php
+++ b/plugins/system/debug/debug.php
@@ -602,6 +602,7 @@ protected function displayProfileInformation()
 		$html[] = '<div class="dbg-profile-list">' . implode('', $htmlMarks) . '</div>';
 
 		$db = JFactory::getDbo();
+
 		//  fix  for support custom shutdown function via register_shutdown_function().
 		$db->disconnect();
 

From 43b267f2a74c8709a1d85bdd8ad42c6172fb8c49 Mon Sep 17 00:00:00 2001
From: Nicola Galgano <extensions4joomla@gmail.com>
Date: Fri, 13 Nov 2015 13:11:54 +0100
Subject: [PATCH 050/176] fix typo referenced by #8415

fixed "AlTER" to "ALTER"
---
 .../com_admin/sql/updates/postgresql/3.5.0-2015-10-26.sql     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/administrator/components/com_admin/sql/updates/postgresql/3.5.0-2015-10-26.sql b/administrator/components/com_admin/sql/updates/postgresql/3.5.0-2015-10-26.sql
index 2b7791e332d54..ef806600996c1 100644
--- a/administrator/components/com_admin/sql/updates/postgresql/3.5.0-2015-10-26.sql
+++ b/administrator/components/com_admin/sql/updates/postgresql/3.5.0-2015-10-26.sql
@@ -1,2 +1,2 @@
-AlTER TABLE "#__contentitem_tag_map" DROP INDEX "#__contentitem_tag_map_idx_tag";
-AlTER TABLE "#__contentitem_tag_map" DROP INDEX "#__contentitem_tag_map_idx_type";
+ALTER TABLE "#__contentitem_tag_map" DROP INDEX "#__contentitem_tag_map_idx_tag";
+ALTER TABLE "#__contentitem_tag_map" DROP INDEX "#__contentitem_tag_map_idx_type";

From d3af913384dc65266cdf3c67ab75a858db01835a Mon Sep 17 00:00:00 2001
From: Nicola Galgano <extensions4joomla@gmail.com>
Date: Fri, 13 Nov 2015 13:14:35 +0100
Subject: [PATCH 051/176] fix typo referenced by #8415

as reported #8415
fixed "AlTER" to "ALTER"
---
 .../com_admin/sql/updates/sqlazure/3.5.0-2015-10-26.sql     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/administrator/components/com_admin/sql/updates/sqlazure/3.5.0-2015-10-26.sql b/administrator/components/com_admin/sql/updates/sqlazure/3.5.0-2015-10-26.sql
index 05ed505765d1e..b3adba686e7e1 100644
--- a/administrator/components/com_admin/sql/updates/sqlazure/3.5.0-2015-10-26.sql
+++ b/administrator/components/com_admin/sql/updates/sqlazure/3.5.0-2015-10-26.sql
@@ -1,3 +1,3 @@
-AlTER TABLE [#__contentitem_tag_map] DROP INDEX [idx_tag_name];
-AlTER TABLE [#__contentitem_tag_map] DROP INDEX [idx_tag];
-AlTER TABLE [#__contentitem_tag_map] DROP INDEX [idx_type];
+ALTER TABLE [#__contentitem_tag_map] DROP INDEX [idx_tag_name];
+ALTER TABLE [#__contentitem_tag_map] DROP INDEX [idx_tag];
+ALTER TABLE [#__contentitem_tag_map] DROP INDEX [idx_type];

From 13a7d8715e625545a3eafdc3a5250de5e5450ee0 Mon Sep 17 00:00:00 2001
From: Nicola Galgano <extensions4joomla@gmail.com>
Date: Fri, 13 Nov 2015 13:16:18 +0100
Subject: [PATCH 052/176] fix typo referenced by #8415

as reported #8415
fixed "AlTER" to "ALTER"
---
 .../com_admin/sql/updates/mysql/3.5.0-2015-10-26.sql          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/administrator/components/com_admin/sql/updates/mysql/3.5.0-2015-10-26.sql b/administrator/components/com_admin/sql/updates/mysql/3.5.0-2015-10-26.sql
index 43051a47355d3..dfc9043ae9c8b 100644
--- a/administrator/components/com_admin/sql/updates/mysql/3.5.0-2015-10-26.sql
+++ b/administrator/components/com_admin/sql/updates/mysql/3.5.0-2015-10-26.sql
@@ -1,2 +1,2 @@
-AlTER TABLE `#__contentitem_tag_map` DROP INDEX `idx_tag`;
-AlTER TABLE `#__contentitem_tag_map` DROP INDEX `idx_type`;
+ALTER TABLE `#__contentitem_tag_map` DROP INDEX `idx_tag`;
+ALTER TABLE `#__contentitem_tag_map` DROP INDEX `idx_type`;

From dcf926083256255f4decfe8926ef590475a78d24 Mon Sep 17 00:00:00 2001
From: Anibal Sanchez <anibal.sanchez@extly.com>
Date: Fri, 13 Nov 2015 16:46:00 +0100
Subject: [PATCH 053/176] editor button->onclick, SyntaxError: expected
 expression, got ','

tinymce is concatenating button callback with , and it generates the SyntaxError.

It is fixed removing ,

To test it, a callback can be added to any of the current editors-xtd plugins. For instance, in plugins/editors-xtd/image/image.php, line 62:

    $button->onclick = 'alert("test")';

When the patch is applied, there is no console error, editor loads fine and when you click on the button it shows 'test'
---
 plugins/editors/tinymce/tinymce.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/editors/tinymce/tinymce.php b/plugins/editors/tinymce/tinymce.php
index 1c375d3db817f..a7fc907c9a611 100644
--- a/plugins/editors/tinymce/tinymce.php
+++ b/plugins/editors/tinymce/tinymce.php
@@ -1066,7 +1066,7 @@ private function tinyButtons()
 							});";
 					if ($onclick && ($button->get('modal') || $href))
 					{
-						$tempConstructor .= ",
+						$tempConstructor .= "
 						" . $onclick . "
 							";
 					}

From b8c6a12cb23047ce1eeb2d22591f2ff3266291e7 Mon Sep 17 00:00:00 2001
From: Anibal Sanchez <anibal.sanchez@extly.com>
Date: Fri, 13 Nov 2015 19:36:11 +0100
Subject: [PATCH 054/176] New line before onclick

As suggested by @RolandD, CR LR before onclick
---
 plugins/editors/tinymce/tinymce.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/editors/tinymce/tinymce.php b/plugins/editors/tinymce/tinymce.php
index a7fc907c9a611..3d6340f32d751 100644
--- a/plugins/editors/tinymce/tinymce.php
+++ b/plugins/editors/tinymce/tinymce.php
@@ -1066,14 +1066,14 @@ private function tinyButtons()
 							});";
 					if ($onclick && ($button->get('modal') || $href))
 					{
-						$tempConstructor .= "
+						$tempConstructor .= "\r\n
 						" . $onclick . "
 							";
 					}
 				}
 				else
 				{
-					$tempConstructor .= "
+					$tempConstructor .= "\r\n
 						" . $onclick . "
 							";
 				}

From 1d3b576408386e241e14037d0a8cb13baebc7ff9 Mon Sep 17 00:00:00 2001
From: t-arapi <letrata@gmail.com>
Date: Fri, 13 Nov 2015 19:41:44 +0100
Subject: [PATCH 055/176] Creating new article unnecessarily load versions

---
 components/com_content/views/form/tmpl/edit.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/com_content/views/form/tmpl/edit.php b/components/com_content/views/form/tmpl/edit.php
index 3d8e80cb8891f..e40a8711b7fc7 100644
--- a/components/com_content/views/form/tmpl/edit.php
+++ b/components/com_content/views/form/tmpl/edit.php
@@ -58,7 +58,7 @@
 					<span class="icon-cancel"></span><?php echo JText::_('JCANCEL') ?>
 				</button>
 			</div>
-			<?php if ($params->get('save_history', 0)) : ?>
+			<?php if ($params->get('save_history', 0) && $this->item->id) : ?>
 			<div class="btn-group">
 				<?php echo $this->form->getInput('contenthistory'); ?>
 			</div>

From 4296da10eb0a6d42fc804562f3c8c979f5fa5357 Mon Sep 17 00:00:00 2001
From: Wim Vandekerckhove <wimvandekerckhove@telenet.be>
Date: Fri, 13 Nov 2015 21:48:07 +0100
Subject: [PATCH 056/176] string change on line 21

Added dash " - " on line 21

The string value speaks of "Plugins > System Joomla! Statistics", however the first string in this language file states "System - Joomla! Statistics". My recommendation would be to change the last part to "Plugins > System - Joomla! Statistics" for consistency with plugin names and string value on line 6
---
 administrator/language/en-GB/en-GB.plg_system_stats.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/administrator/language/en-GB/en-GB.plg_system_stats.ini b/administrator/language/en-GB/en-GB.plg_system_stats.ini
index fbabf131ac101..871bb1c3c1148 100644
--- a/administrator/language/en-GB/en-GB.plg_system_stats.ini
+++ b/administrator/language/en-GB/en-GB.plg_system_stats.ini
@@ -18,7 +18,7 @@ PLG_SYSTEM_STATS_MODE_OPTION_ALWAYS_SEND="Always send"
 PLG_SYSTEM_STATS_MODE_OPTION_NEVER_SEND="Never send"
 PLG_SYSTEM_STATS_MODE_OPTION_ON_DEMAND="On demand"
 PLG_SYSTEM_STATS_MSG_ALLOW_SENDING_DATA="Enable Joomla Statistics?"
-PLG_SYSTEM_STATS_MSG_JOOMLA_WANTS_TO_SEND_DATA="In order to better understand our install base and end user environments, this plugin has been created to send those statistics back to a Joomla! controlled central server. No identifying data is captured at any point. You can change these settings later from Plugins > System Joomla! Statistics."
+PLG_SYSTEM_STATS_MSG_JOOMLA_WANTS_TO_SEND_DATA="In order to better understand our install base and end user environments, this plugin has been created to send those statistics back to a Joomla! controlled central server. No identifying data is captured at any point. You can change these settings later from Plugins > System - Joomla! Statistics."
 PLG_SYSTEM_STATS_MSG_WHAT_DATA_WILL_BE_SENT="Click here to see which information will be sent."
 PLG_SYSTEM_STATS_RESET_UNIQUE_ID="Reset Unique Id"
 PLG_SYSTEM_STATS_UNIQUE_ID_DESC="An identifier that allows the Joomla! project to count unique installs of the plugin. This is sent with the statistics back to the server."

From 89db890c81d790fdbd4b3345c8a3d9264459f8fd Mon Sep 17 00:00:00 2001
From: Scott <scott@paragonie.com>
Date: Fri, 13 Nov 2015 16:08:32 -0500
Subject: [PATCH 057/176] Add example text.

---
 libraries/joomla/crypt/README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libraries/joomla/crypt/README.md b/libraries/joomla/crypt/README.md
index 4fa7c0d2b2ecd..745cf2ce1f4b9 100644
--- a/libraries/joomla/crypt/README.md
+++ b/libraries/joomla/crypt/README.md
@@ -5,6 +5,8 @@ If you're going to use JCrypt in any of your plugins, make *sure* you use **JCry
 ```php
 $cipher = new JCryptCipherCrypto();
 $key = $cipher->generateKey(); // Store this for long-term use
+
+$message = "We're all living on a yellow submarine!";
 $ciphertext = $cipher->encrypt($message, $key);
 $decrypted = $cipher->decrypt($ciphertext, $key);
 ```

From ea76b5482a1edd27a95668c6bc17e684a9fb1cc8 Mon Sep 17 00:00:00 2001
From: bertmert <bertmert@users.noreply.github.com>
Date: Sat, 14 Nov 2015 15:55:10 +0100
Subject: [PATCH 058/176] chosen disable_search_threshold. Override default.

---
 administrator/components/com_modules/views/module/tmpl/edit.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/administrator/components/com_modules/views/module/tmpl/edit.php b/administrator/components/com_modules/views/module/tmpl/edit.php
index 5231e07995867..b07ed125448bf 100644
--- a/administrator/components/com_modules/views/module/tmpl/edit.php
+++ b/administrator/components/com_modules/views/module/tmpl/edit.php
@@ -13,7 +13,7 @@
 
 JHtml::_('behavior.formvalidator');
 JHtml::_('behavior.combobox');
-JHtml::_('formbehavior.chosen', 'select');
+JHtml::_('formbehavior.chosen', 'select', null, array('disable_search_threshold' => 1));
 
 $hasContent = empty($this->item->module) ||  isset($this->item->xml->customContent);
 $hasContentFieldName = "content";

From 611bfb7e3c63bb758afa5d3c3fae8652fe43a4a1 Mon Sep 17 00:00:00 2001
From: bertmert <bertmert@users.noreply.github.com>
Date: Sat, 14 Nov 2015 16:18:14 +0100
Subject: [PATCH 059/176] Update edit.php

---
 administrator/components/com_modules/views/module/tmpl/edit.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/administrator/components/com_modules/views/module/tmpl/edit.php b/administrator/components/com_modules/views/module/tmpl/edit.php
index b07ed125448bf..285d5ca77eb70 100644
--- a/administrator/components/com_modules/views/module/tmpl/edit.php
+++ b/administrator/components/com_modules/views/module/tmpl/edit.php
@@ -13,7 +13,7 @@
 
 JHtml::_('behavior.formvalidator');
 JHtml::_('behavior.combobox');
-JHtml::_('formbehavior.chosen', 'select', null, array('disable_search_threshold' => 1));
+JHtml::_('formbehavior.chosen', 'select', null, array('disable_search_threshold' => 0));
 
 $hasContent = empty($this->item->module) ||  isset($this->item->xml->customContent);
 $hasContentFieldName = "content";

From 13d74e857dfc2c1dbe2058779eb7e27dcb858b73 Mon Sep 17 00:00:00 2001
From: itsexe <hello@itsexe.me>
Date: Sat, 14 Nov 2015 22:39:28 +0100
Subject: [PATCH 060/176] removed unnecessary if query

---
 libraries/joomla/mail/mail.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/libraries/joomla/mail/mail.php b/libraries/joomla/mail/mail.php
index cc007684eef40..f246bee328663 100644
--- a/libraries/joomla/mail/mail.php
+++ b/libraries/joomla/mail/mail.php
@@ -511,10 +511,7 @@ public function sendMail($from, $fromName, $recipient, $subject, $body, $mode =
 		$this->setBody($body);
 
 		// Are we sending the email as HTML?
-		if ($mode)
-		{
-			$this->isHtml(true);
-		}
+		$this->isHtml($mode);
 
 		$this->addRecipient($recipient);
 		$this->addCc($cc);

From 8ae2bc59a2b1f9259db44df2fe5e84eaaae313ba Mon Sep 17 00:00:00 2001
From: Richard Fath <richard67@users.noreply.github.com>
Date: Mon, 16 Nov 2015 13:22:23 +0100
Subject: [PATCH 061/176] Correct typo in README.md made with PR #8407

Correct typo in libraries/joomla/crypt/README.md made with PR #8407 - can be merged my review from my point of view, nothing to test
---
 libraries/joomla/crypt/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/joomla/crypt/README.md b/libraries/joomla/crypt/README.md
index 745cf2ce1f4b9..8a0fd935ddd48 100644
--- a/libraries/joomla/crypt/README.md
+++ b/libraries/joomla/crypt/README.md
@@ -1,6 +1,6 @@
 # Important Security Information
 
-If you're going to use JCrypt in any of your plugins, make *sure* you use **JCryptCipherCrypt**; it's the only one that's cryptographically secure. (It's [version 1.1 of Defuse Security's encryption library](https://github.com/defuse/php-encryption)).
+If you're going to use JCrypt in any of your plugins, make *sure* you use **JCryptCipherCrypto**; it's the only one that's cryptographically secure. (It's [version 1.1 of Defuse Security's encryption library](https://github.com/defuse/php-encryption)).
 
 ```php
 $cipher = new JCryptCipherCrypto();

From d8aad68bdcd4a60e74ccad7165a58250cacf5cb5 Mon Sep 17 00:00:00 2001
From: dgt41 <d.grammatiko@gmail.com>
Date: Mon, 9 Nov 2015 07:45:37 +0200
Subject: [PATCH 062/176] DRY please

---
 plugins/editors/tinymce/tinymce.php | 133 ++++++++++------------------
 1 file changed, 46 insertions(+), 87 deletions(-)

diff --git a/plugins/editors/tinymce/tinymce.php b/plugins/editors/tinymce/tinymce.php
index 3d6340f32d751..e85775011f1a2 100644
--- a/plugins/editors/tinymce/tinymce.php
+++ b/plugins/editors/tinymce/tinymce.php
@@ -707,13 +707,12 @@ public function onInit()
 			$mode         = 0;
 		}
 
-		switch ($mode)
-		{
-			case 0: /* Simple mode*/
-				JFactory::getDocument()->addScriptDeclaration(
-					"
+		$script = "
 		tinymce.init({
-			// General
+		";
+
+		// General
+		$script .= "
 			directionality: \"$text_direction\",
 			selector: \"textarea.mce_editable\",
 			language : \"$langPrefix\",
@@ -722,101 +721,71 @@ public function onInit()
 			$skin
 			theme : \"$theme\",
 			schema: \"html5\",
-			menubar: false,
-			toolbar1: \"bold italics underline strikethrough | undo redo | bullist numlist | $toolbar5 | code\",
-			plugins: \"$dragDropPlg code\",
-			// Cleanup/Output
+			";
+
+		// Cleanup/Output
+		$script .= "
 			inline_styles : true,
 			gecko_spellcheck : true,
 			entity_encoding : \"$entity_encoding\",
 			$forcenewline
 			$smallButtons
-			// URL
+		";
+
+		// URL
+		$script .= "
 			relative_urls : $relative_urls,
 			remove_script_host : false,
-			// Layout
+		";
+
+		// Layout
+		$script .= "
 			$content_css
 			document_base_url : \"" . JUri::root() . "\",
 			setup: function (editor) {
-				$tinyBtns
+		$tinyBtns
 			},
-			paste_data_images: $allowImgPaste
+			paste_data_images: $allowImgPaste,
+		";
+		switch ($mode)
+		{
+			case 0: /* Simple mode*/
+				$script .= "
+			menubar: false,
+			toolbar1: \"bold italics underline strikethrough | undo redo | bullist numlist | $toolbar5 | code\",
+			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 image | hr table | subscript superscript | charmap";
-				JFactory::getDocument()->addScriptDeclaration(
-					"
-		tinyMCE.init({
-			// General
-			directionality: \"$text_direction\",
-			language : \"$langPrefix\",
-			mode : \"specific_textareas\",
-			autosave_restore_when_empty: false,
-			$skin
-			theme : \"$theme\",
-			schema: \"html5\",
-			selector: \"textarea.mce_editable\",
-			// Cleanup/Output
-			inline_styles : true,
-			gecko_spellcheck : true,
-			entity_encoding : \"$entity_encoding\",
+
+			$script .= "
 			valid_elements : \"$valid_elements\",
 			extended_valid_elements : \"$elements\",
-			$forcenewline
-			$smallButtons
 			invalid_elements : \"$invalid_elements\",
 			// Plugins
 			plugins : \"table link image code hr charmap autolink lists importcss $dragDropPlg\",
 			// Toolbar
 			toolbar1: \"$toolbar1 | $toolbar5 | code\",
 			removed_menuitems: \"newdocument\",
-			// URL
-			relative_urls : $relative_urls,
-			remove_script_host : false,
-			document_base_url : \"" . JUri::root() . "\",
 			// Layout
-			$content_css
 			importcss_append: true,
 			// Advanced Options
 			$resizing
 			height : \"$html_height\",
-			width : \"$html_width\",
-			setup: function (editor) {
-				$tinyBtns
-			},
-			paste_data_images: $allowImgPaste
+			width : \"$html_width\"
 		});
-			"
-				);
+			";
 				break;
 
 			case 2: /* Extended mode*/
-				JFactory::getDocument()->addScriptDeclaration(
-					"
-		tinyMCE.init({
-			// General
-			directionality: \"$text_direction\",
-			language : \"$langPrefix\",
-			mode : \"specific_textareas\",
-			autosave_restore_when_empty: false,
-			$skin
-			theme : \"$theme\",
-			schema: \"html5\",
-			selector: \"textarea.mce_editable\",
-			// Cleanup/Output
-			inline_styles : true,
-			gecko_spellcheck : true,
-			entity_encoding : \"$entity_encoding\",
+					$script .= "
 			valid_elements : \"$valid_elements\",
 			extended_valid_elements : \"$elements\",
-			$forcenewline
-			$smallButtons
 			invalid_elements : \"$invalid_elements\",
 			// Plugins
 			plugins : \"$plugins $dragDropPlg\",
@@ -824,9 +793,6 @@ public function onInit()
 			toolbar1: \"$toolbar1 | code\",
 			removed_menuitems: \"newdocument\",
 			// URL
-			relative_urls : $relative_urls,
-			remove_script_host : false,
-			document_base_url : \"" . JUri::root() . "\",
 			rel_list : [
 				{title: 'Alternate', value: 'alternate'},
 				{title: 'Author', value: 'author'},
@@ -845,34 +811,18 @@ public function onInit()
 			//Templates
 			" . $templates . "
 			// Layout
-			$content_css
 			importcss_append: true,
 			// Advanced Options
 			$resizing
 			image_advtab: $image_advtab,
 			height : \"$html_height\",
 			width : \"$html_width\",
-			setup: function (editor) {
-				$tinyBtns
-			},
-			paste_data_images: $allowImgPaste
 		});
-		"
-				);
+		";
 				break;
 		}
 
-		if (!empty($btnsNames))
-		{
-			JFactory::getDocument()->addScriptDeclaration(
-				"
-		function jInsertEditorText( text, editor )
-		{
-			tinyMCE.activeEditor.execCommand('mceInsertContent', false, text);
-		}
-			"
-			);
-		}
+		JFactory::getDocument()->addScriptDeclaration($script);
 
 		return;
 	}
@@ -886,7 +836,7 @@ function jInsertEditorText( text, editor )
 	 */
 	public function onGetContent($editor)
 	{
-		return 'tinyMCE.activeEditor.getContent();';
+		return 'tinyMCE.getElementById("' . $editor . '").getContent();';
 	}
 
 	/**
@@ -899,7 +849,7 @@ public function onGetContent($editor)
 	 */
 	public function onSetContent($editor, $html)
 	{
-		return 'tinyMCE.activeEditor.setContent(' . $html . ');';
+		return 'tinyMCE.getElementById("' . $editor .'").setContent(' . $html . ');';
 	}
 
 	/**
@@ -925,6 +875,15 @@ public function onSave($editor)
 	 */
 	public function onGetInsertMethod($name)
 	{
+		JFactory::getDocument()->addScriptDeclaration(
+			"
+		function jInsertEditorText( text, editor )
+		{
+			tinyMCE.get('" . $name . "').execCommand('mceInsertContent', false, text);
+		}
+			"
+		);
+
 		return;
 	}
 

From 7caeab0b4d3cd960336c34170447e81d4b81c1c5 Mon Sep 17 00:00:00 2001
From: dgt41 <d.grammatiko@gmail.com>
Date: Tue, 10 Nov 2015 10:06:31 +0100
Subject: [PATCH 063/176] cs

---
 plugins/editors/tinymce/tinymce.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/editors/tinymce/tinymce.php b/plugins/editors/tinymce/tinymce.php
index e85775011f1a2..88725e0ec88c7 100644
--- a/plugins/editors/tinymce/tinymce.php
+++ b/plugins/editors/tinymce/tinymce.php
@@ -849,7 +849,7 @@ public function onGetContent($editor)
 	 */
 	public function onSetContent($editor, $html)
 	{
-		return 'tinyMCE.getElementById("' . $editor .'").setContent(' . $html . ');';
+		return 'tinyMCE.getElementById("' . $editor . '").setContent(' . $html . ');';
 	}
 
 	/**

From e251cc18f9197c701fe8bcdcfbf6dbd20eeb8b20 Mon Sep 17 00:00:00 2001
From: dgt41 <d.grammatiko@gmail.com>
Date: Thu, 12 Nov 2015 13:18:14 +0100
Subject: [PATCH 064/176] Overrides for jModalClose, SqueezeBox.close and

fallback for calculated modal  width/height
---
 plugins/editors/tinymce/tinymce.php | 42 +++++++++++++++++++++++++----
 1 file changed, 37 insertions(+), 5 deletions(-)

diff --git a/plugins/editors/tinymce/tinymce.php b/plugins/editors/tinymce/tinymce.php
index 88725e0ec88c7..19cdd03804fad 100644
--- a/plugins/editors/tinymce/tinymce.php
+++ b/plugins/editors/tinymce/tinymce.php
@@ -783,7 +783,7 @@ public function onInit()
 				break;
 
 			case 2: /* Extended mode*/
-					$script .= "
+			$script .= "
 			valid_elements : \"$valid_elements\",
 			extended_valid_elements : \"$elements\",
 			invalid_elements : \"$invalid_elements\",
@@ -822,6 +822,29 @@ public function onInit()
 				break;
 		}
 
+		if (!empty($btnsNames))
+		{
+			JFactory::getDocument()->addScriptDeclaration(
+					"
+		function jModalClose() {
+			tinyMCE.activeEditor.windowManager.close();
+		}
+		var SqueezeBox;
+		if (SqueezeBox != undefined)
+		{
+			var otherStr = 'SqueezeBox.close', otherCallback;
+			otherCallback = new Function(otherStr);
+			otherCallback.call(SqueezeBox.close);
+		} else {
+			var SqueezeBox = {};
+			SqueezeBox.close = function(){
+				tinyMCE.activeEditor.windowManager.close();
+			}
+		}
+			"
+			);
+		}
+
 		JFactory::getDocument()->addScriptDeclaration($script);
 
 		return;
@@ -992,10 +1015,19 @@ private function tinyButtons()
 				// Get the modal width/height
 				if ($options)
 				{
-					preg_match('/x:\s*+\d{2,4}/', $options, $modalWidth);
-					preg_match('/y:\s*+\d{2,4}/', $options, $modalHeight);
-					$modalWidth  = filter_var(implode("", $modalWidth), FILTER_SANITIZE_NUMBER_INT);
-					$modalHeight = filter_var(implode("", $modalHeight), FILTER_SANITIZE_NUMBER_INT);
+					preg_match('/\s*+(window)/', $options, $matches);
+					if (in_array('window', $matches))
+					{
+						$modalWidth  = '800';
+						$modalHeight = '600';
+					}
+					else
+					{
+						preg_match('/x:\s*+\d{2,4}/', $options, $modalWidth);
+						preg_match('/y:\s*+\d{2,4}/', $options, $modalHeight);
+						$modalWidth  = filter_var(implode("", $modalWidth), FILTER_SANITIZE_NUMBER_INT);
+						$modalHeight = filter_var(implode("", $modalHeight), FILTER_SANITIZE_NUMBER_INT);
+					}
 				}
 
 				// Now we can built the script

From 51123a27389acac44fe09e54ffff7341e3f595db Mon Sep 17 00:00:00 2001
From: dgt41 <d.grammatiko@gmail.com>
Date: Fri, 13 Nov 2015 11:41:18 +0200
Subject: [PATCH 065/176] fixes

---
 plugins/editors/tinymce/tinymce.php | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/plugins/editors/tinymce/tinymce.php b/plugins/editors/tinymce/tinymce.php
index 19cdd03804fad..a75073b632f94 100644
--- a/plugins/editors/tinymce/tinymce.php
+++ b/plugins/editors/tinymce/tinymce.php
@@ -822,6 +822,14 @@ public function onInit()
 				break;
 		}
 
+		$script .= "
+		function jInsertEditorText( text, editor )
+		{
+			tinyMCE.activeEditor.execCommand('mceInsertContent', false, text);
+		}
+		";
+
+
 		if (!empty($btnsNames))
 		{
 			JFactory::getDocument()->addScriptDeclaration(
@@ -859,7 +867,7 @@ function jModalClose() {
 	 */
 	public function onGetContent($editor)
 	{
-		return 'tinyMCE.getElementById("' . $editor . '").getContent();';
+		return 'tinyMCE.get("' . $editor . '").getContent();';
 	}
 
 	/**
@@ -872,7 +880,7 @@ public function onGetContent($editor)
 	 */
 	public function onSetContent($editor, $html)
 	{
-		return 'tinyMCE.getElementById("' . $editor . '").setContent(' . $html . ');';
+		return 'tinyMCE.get("' . $editor . '").setContent(' . $html . ');';
 	}
 
 	/**
@@ -898,15 +906,6 @@ public function onSave($editor)
 	 */
 	public function onGetInsertMethod($name)
 	{
-		JFactory::getDocument()->addScriptDeclaration(
-			"
-		function jInsertEditorText( text, editor )
-		{
-			tinyMCE.get('" . $name . "').execCommand('mceInsertContent', false, text);
-		}
-			"
-		);
-
 		return;
 	}
 

From 17adc45411efe2ff6079c6445734e9e3c340077d Mon Sep 17 00:00:00 2001
From: dgt41 <d.grammatiko@gmail.com>
Date: Fri, 13 Nov 2015 11:59:19 +0200
Subject: [PATCH 066/176] cs

---
 plugins/editors/tinymce/tinymce.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/plugins/editors/tinymce/tinymce.php b/plugins/editors/tinymce/tinymce.php
index a75073b632f94..f5691077703d9 100644
--- a/plugins/editors/tinymce/tinymce.php
+++ b/plugins/editors/tinymce/tinymce.php
@@ -829,7 +829,6 @@ function jInsertEditorText( text, editor )
 		}
 		";
 
-
 		if (!empty($btnsNames))
 		{
 			JFactory::getDocument()->addScriptDeclaration(

From b80c47e934a4a254b97f21d437939882426be34d Mon Sep 17 00:00:00 2001
From: dgt41 <d.grammatiko@gmail.com>
Date: Sat, 14 Nov 2015 03:10:01 +0200
Subject: [PATCH 067/176] Uncaught TypeError

---
 plugins/editors/tinymce/tinymce.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/editors/tinymce/tinymce.php b/plugins/editors/tinymce/tinymce.php
index f5691077703d9..ba2b2035aaf15 100644
--- a/plugins/editors/tinymce/tinymce.php
+++ b/plugins/editors/tinymce/tinymce.php
@@ -866,7 +866,7 @@ function jModalClose() {
 	 */
 	public function onGetContent($editor)
 	{
-		return 'tinyMCE.get("' . $editor . '").getContent();';
+		return 'tinyMCE.activeEditor.getContent();';
 	}
 
 	/**
@@ -879,7 +879,7 @@ public function onGetContent($editor)
 	 */
 	public function onSetContent($editor, $html)
 	{
-		return 'tinyMCE.get("' . $editor . '").setContent(' . $html . ');';
+		return 'tinyMCE.activeEditor.setContent(' . $html . ');';
 	}
 
 	/**

From 863d1ee80536d829ff1f6b4caefa3962604af3e7 Mon Sep 17 00:00:00 2001
From: dgt41 <d.grammatiko@gmail.com>
Date: Sat, 14 Nov 2015 03:25:28 +0200
Subject: [PATCH 068/176] use jQuery

---
 plugins/editors/tinymce/tinymce.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/editors/tinymce/tinymce.php b/plugins/editors/tinymce/tinymce.php
index ba2b2035aaf15..aad2fbe4f925e 100644
--- a/plugins/editors/tinymce/tinymce.php
+++ b/plugins/editors/tinymce/tinymce.php
@@ -1016,8 +1016,8 @@ private function tinyButtons()
 					preg_match('/\s*+(window)/', $options, $matches);
 					if (in_array('window', $matches))
 					{
-						$modalWidth  = '800';
-						$modalHeight = '600';
+						$modalWidth  = 'window.parent.jQuery(window).width() - 100';
+						$modalHeight = 'window.parent.jQuery(window).height() - 200';
 					}
 					else
 					{

From 11041f4053d613b87e0c65355385314457baff8a Mon Sep 17 00:00:00 2001
From: dgt41 <d.grammatiko@gmail.com>
Date: Mon, 16 Nov 2015 11:48:46 +0200
Subject: [PATCH 069/176] Thanks @Fedik

---
 plugins/editors/tinymce/tinymce.php | 69 ++++++++++++++++-------------
 1 file changed, 39 insertions(+), 30 deletions(-)

diff --git a/plugins/editors/tinymce/tinymce.php b/plugins/editors/tinymce/tinymce.php
index aad2fbe4f925e..7f275373ee706 100644
--- a/plugins/editors/tinymce/tinymce.php
+++ b/plugins/editors/tinymce/tinymce.php
@@ -707,7 +707,14 @@ public function onInit()
 			$mode         = 0;
 		}
 
-		$script = "
+		$script = '';
+
+				// Mootools b/c
+		$script .= '
+		window.getSize = window.getSize || function(){return {x: jQuery(window).width(), y: jQuery(window).height()};};
+		';
+
+		$script .= "
 		tinymce.init({
 		";
 
@@ -1010,26 +1017,27 @@ private function tinyButtons()
 				// We do some hack here to set the correct icon for 3PD buttons
 				$icon = 'none icon-' . $icon;
 
+				// Now we can built the script
+				$tempConstructor = '
+			!(function(){';
+
 				// Get the modal width/height
-				if ($options)
+				if ($options && is_scalar($options))
 				{
-					preg_match('/\s*+(window)/', $options, $matches);
-					if (in_array('window', $matches))
-					{
-						$modalWidth  = 'window.parent.jQuery(window).width() - 100';
-						$modalHeight = 'window.parent.jQuery(window).height() - 200';
-					}
-					else
-					{
-						preg_match('/x:\s*+\d{2,4}/', $options, $modalWidth);
-						preg_match('/y:\s*+\d{2,4}/', $options, $modalHeight);
-						$modalWidth  = filter_var(implode("", $modalWidth), FILTER_SANITIZE_NUMBER_INT);
-						$modalHeight = filter_var(implode("", $modalHeight), FILTER_SANITIZE_NUMBER_INT);
-					}
+					$tempConstructor .= '
+				var getBtnOptions = new Function("return ' . addslashes($options) . '"),
+					btnOptions = getBtnOptions(),
+					modalWidth = btnOptions.size && btnOptions.size.x ?  btnOptions.size.x : null,
+					modalHeight = btnOptions.size && btnOptions.size.y ?  btnOptions.size.y : null;';
+
+				}
+				else {
+					$tempConstructor .= '
+				var btnOptions = {}, modalWidth = null, modalHeight = null;';
 				}
 
-				// Now we can built the script
-				$tempConstructor = "
+
+				$tempConstructor .= "
 				editor.addButton(\"" . $name . "\", {
 					text: \"" . $title . "\",
 					title: \"" . $title . "\",
@@ -1038,21 +1046,21 @@ private function tinyButtons()
 				if ($button->get('modal') || $href)
 				{
 					$tempConstructor .= "
-							editor.windowManager.open({
+							var modalOptions = {
 								title  : \"" . $title . "\",
-								url : '" . $href . "',";
-					if (!empty($modalHeight) && !empty($modalWidth))
-					{
-						$tempConstructor .= "
-								width  : $modalWidth,
-								height : $modalHeight,";
-					}
-					$tempConstructor .= "
+								url : '" . $href . "',
 								buttons: [{
 									text   : \"Close\",
 									onclick: \"close\"
 								}]
-							});";
+							}
+							if(modalWidth){
+								modalOptions.width = modalWidth;
+							}
+							if(modalHeight){
+								modalOptions.height = modalHeight;
+							}
+							editor.windowManager.open(modalOptions);";
 					if ($onclick && ($button->get('modal') || $href))
 					{
 						$tempConstructor .= "\r\n
@@ -1068,7 +1076,8 @@ private function tinyButtons()
 				}
 				$tempConstructor .= "
 					}
-				})";
+				});
+			})();";
 
 				// The array with the toolbar buttons
 				$btnsNames[] = $name;
@@ -1079,8 +1088,8 @@ private function tinyButtons()
 		}
 
 		return array(
-			'names'  => $btnsNames,
-			'script' => $tinyBtns
+				'names'  => $btnsNames,
+				'script' => $tinyBtns
 		);
 	}
 }

From b03b1acefee0138569a2dfd0591b7a1345ea3847 Mon Sep 17 00:00:00 2001
From: dgt41 <d.grammatiko@gmail.com>
Date: Mon, 16 Nov 2015 12:09:59 +0200
Subject: [PATCH 070/176] cs

---
 plugins/editors/tinymce/tinymce.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/editors/tinymce/tinymce.php b/plugins/editors/tinymce/tinymce.php
index 7f275373ee706..6348556e725b3 100644
--- a/plugins/editors/tinymce/tinymce.php
+++ b/plugins/editors/tinymce/tinymce.php
@@ -1031,12 +1031,12 @@ private function tinyButtons()
 					modalHeight = btnOptions.size && btnOptions.size.y ?  btnOptions.size.y : null;';
 
 				}
-				else {
+				else
+				{
 					$tempConstructor .= '
 				var btnOptions = {}, modalWidth = null, modalHeight = null;';
 				}
 
-
 				$tempConstructor .= "
 				editor.addButton(\"" . $name . "\", {
 					text: \"" . $title . "\",

From 2b774e66b9cd6e7c991e23f9e332691be200d9fb Mon Sep 17 00:00:00 2001
From: dgt41 <d.grammatiko@gmail.com>
Date: Mon, 16 Nov 2015 22:52:11 +0200
Subject: [PATCH 071/176] Thanks @roland-d

---
 plugins/editors/tinymce/tinymce.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/editors/tinymce/tinymce.php b/plugins/editors/tinymce/tinymce.php
index 6348556e725b3..e2ec260c06cad 100644
--- a/plugins/editors/tinymce/tinymce.php
+++ b/plugins/editors/tinymce/tinymce.php
@@ -860,6 +860,7 @@ function jModalClose() {
 		}
 
 		JFactory::getDocument()->addScriptDeclaration($script);
+		JFactory::getDocument()->addStyleDeclaration(".mce-in { padding: 5px 10px !important;}");
 
 		return;
 	}

From 108f1c5123de5b5e791ae7358f854d7279b0bcff Mon Sep 17 00:00:00 2001
From: Robert Deutz <rdeutz@googlemail.com>
Date: Mon, 16 Nov 2015 23:57:36 +0100
Subject: [PATCH 072/176] removed functions can't included in code coverage

removed functions:
_sortObjects
_fromObject

these functions are removed with commit 012d28b19c2194ea8bf769e3ffcc45c81847e013 from 2014

I agree that it strange, why we find out a year later
---
 .../unit/suites/libraries/joomla/utilities/JArrayHelperTest.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tests/unit/suites/libraries/joomla/utilities/JArrayHelperTest.php b/tests/unit/suites/libraries/joomla/utilities/JArrayHelperTest.php
index 8a1c5d26ceedd..7260e89500844 100644
--- a/tests/unit/suites/libraries/joomla/utilities/JArrayHelperTest.php
+++ b/tests/unit/suites/libraries/joomla/utilities/JArrayHelperTest.php
@@ -1387,7 +1387,6 @@ public function testArrayUnique($input, $expected)
 	 *
 	 * @dataProvider  getTestFromObjectData
 	 * @covers  JArrayHelper::fromObject
-	 * @covers  JArrayHelper::_fromObject
 	 * @since   11.1
 	 */
 	public function testFromObject($input, $recurse, $regex, $expect, $defaults)
@@ -1552,7 +1551,6 @@ public function testPivot($source, $key, $expected)
 	 *
 	 * @dataProvider getTestSortObjectData
 	 * @covers  JArrayHelper::sortObjects
-	 * @covers  JArrayHelper::_sortObjects
 	 * @since   11.1
 	 */
 	public function testSortObjects($input, $key, $direction, $casesensitive, $locale, $expect, $message, $defaults, $swappableKeys = array())

From 56140b474ed9f2b10b20bd2dbb9e4e6c3f68a74b Mon Sep 17 00:00:00 2001
From: Robert Deutz <rdeutz@googlemail.com>
Date: Tue, 17 Nov 2015 00:05:24 +0100
Subject: [PATCH 073/176] Revert "Minimizing JArrayHelper by using
 Joomla\Utilities\ArrayHelper internally"

---
 libraries/joomla/utilities/arrayhelper.php | 242 +++++++++++++++++++--
 1 file changed, 228 insertions(+), 14 deletions(-)

diff --git a/libraries/joomla/utilities/arrayhelper.php b/libraries/joomla/utilities/arrayhelper.php
index 01e54b6bc1535..3b73a1253792c 100644
--- a/libraries/joomla/utilities/arrayhelper.php
+++ b/libraries/joomla/utilities/arrayhelper.php
@@ -64,7 +64,29 @@ abstract class JArrayHelper
 	 */
 	public static function toInteger(&$array, $default = null)
 	{
-		$array = ArrayHelper::toInteger($array, $default);
+		if (is_array($array))
+		{
+			foreach ($array as $i => $v)
+			{
+				$array[$i] = (int) $v;
+			}
+		}
+		else
+		{
+			if ($default === null)
+			{
+				$array = array();
+			}
+			elseif (is_array($default))
+			{
+				self::toInteger($default, null);
+				$array = $default;
+			}
+			else
+			{
+				$array = array((int) $default);
+			}
+		}
 	}
 
 	/**
@@ -138,7 +160,63 @@ public static function toString($array = null, $inner_glue = '=', $outer_glue =
 	 */
 	public static function fromObject($p_obj, $recurse = true, $regex = null)
 	{
-		return ArrayHelper::fromObject($p_obj, $recurse, $regex);
+		if (is_object($p_obj))
+		{
+			return self::_fromObject($p_obj, $recurse, $regex);
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Utility function to map an object or array to an array
+	 *
+	 * @param   mixed    $item     The source object or array
+	 * @param   boolean  $recurse  True to recurse through multi-level objects
+	 * @param   string   $regex    An optional regular expression to match on field names
+	 *
+	 * @return  array  The array mapped from the given object
+	 *
+	 * @since   11.1
+	 */
+	protected static function _fromObject($item, $recurse, $regex)
+	{
+		if (is_object($item))
+		{
+			$result = array();
+
+			foreach (get_object_vars($item) as $k => $v)
+			{
+				if (!$regex || preg_match($regex, $k))
+				{
+					if ($recurse)
+					{
+						$result[$k] = self::_fromObject($v, $recurse, $regex);
+					}
+					else
+					{
+						$result[$k] = $v;
+					}
+				}
+			}
+		}
+		elseif (is_array($item))
+		{
+			$result = array();
+
+			foreach ($item as $k => $v)
+			{
+				$result[$k] = self::_fromObject($v, $recurse, $regex);
+			}
+		}
+		else
+		{
+			$result = $item;
+		}
+
+		return $result;
 	}
 
 	/**
@@ -249,16 +327,65 @@ public static function isAssociative($array)
 	public static function pivot($source, $key = null)
 	{
 		$result = array();
+		$counter = array();
 
-		if (is_array($source))
+		foreach ($source as $index => $value)
 		{
-			$result = ArrayHelper::pivot($source, $key);
-		}
-		else
-		{
-			JLog::add('This method is typehinted to be an array in \Joomla\Utilities\ArrayHelper::pivot.', JLog::WARNING, 'deprecated');
+			// Determine the name of the pivot key, and its value.
+			if (is_array($value))
+			{
+				// If the key does not exist, ignore it.
+				if (!isset($value[$key]))
+				{
+					continue;
+				}
+
+				$resultKey = $value[$key];
+				$resultValue = &$source[$index];
+			}
+			elseif (is_object($value))
+			{
+				// If the key does not exist, ignore it.
+				if (!isset($value->$key))
+				{
+					continue;
+				}
+
+				$resultKey = $value->$key;
+				$resultValue = &$source[$index];
+			}
+			else
+			{
+				// Just a scalar value.
+				$resultKey = $value;
+				$resultValue = $index;
+			}
+
+			// The counter tracks how many times a key has been used.
+			if (empty($counter[$resultKey]))
+			{
+				// The first time around we just assign the value to the key.
+				$result[$resultKey] = $resultValue;
+				$counter[$resultKey] = 1;
+			}
+			elseif ($counter[$resultKey] == 1)
+			{
+				// If there is a second time, we convert the value into an array.
+				$result[$resultKey] = array(
+					$result[$resultKey],
+					$resultValue,
+				);
+				$counter[$resultKey]++;
+			}
+			else
+			{
+				// After the second time, no need to track any more. Just append to the existing array.
+				$result[$resultKey][] = $resultValue;
+			}
 		}
 
+		unset($counter);
+
 		return $result;
 	}
 
@@ -278,16 +405,86 @@ public static function pivot($source, $key = null)
 	 */
 	public static function sortObjects(&$a, $k, $direction = 1, $caseSensitive = true, $locale = false)
 	{
-		if (is_array($a))
+		if (!is_array($locale) || !is_array($locale[0]))
 		{
-			$a = ArrayHelper::sortObjects($a, $k, $direction, $caseSensitive, $locale);
+			$locale = array($locale);
 		}
-		else
+
+		self::$sortCase = (array) $caseSensitive;
+		self::$sortDirection = (array) $direction;
+		self::$sortKey = (array) $k;
+		self::$sortLocale = $locale;
+
+		usort($a, array(__CLASS__, '_sortObjects'));
+
+		self::$sortCase = null;
+		self::$sortDirection = null;
+		self::$sortKey = null;
+		self::$sortLocale = null;
+
+		return $a;
+	}
+
+	/**
+	 * Callback function for sorting an array of objects on a key
+	 *
+	 * @param   array  &$a  An array of objects
+	 * @param   array  &$b  An array of objects
+	 *
+	 * @return  integer  Comparison status
+	 *
+	 * @see     JArrayHelper::sortObjects()
+	 * @since   11.1
+	 */
+	protected static function _sortObjects(&$a, &$b)
+	{
+		$key = self::$sortKey;
+
+		for ($i = 0, $count = count($key); $i < $count; $i++)
 		{
-			JLog::add('This method is typehinted to be an array in \Joomla\Utilities\ArrayHelper::sortObjects.', JLog::WARNING, 'deprecated');
+			if (isset(self::$sortDirection[$i]))
+			{
+				$direction = self::$sortDirection[$i];
+			}
+
+			if (isset(self::$sortCase[$i]))
+			{
+				$caseSensitive = self::$sortCase[$i];
+			}
+
+			if (isset(self::$sortLocale[$i]))
+			{
+				$locale = self::$sortLocale[$i];
+			}
+
+			$va = $a->{$key[$i]};
+			$vb = $b->{$key[$i]};
+
+			if ((is_bool($va) || is_numeric($va)) && (is_bool($vb) || is_numeric($vb)))
+			{
+				$cmp = $va - $vb;
+			}
+			elseif ($caseSensitive)
+			{
+				$cmp = JString::strcmp($va, $vb, $locale);
+			}
+			else
+			{
+				$cmp = JString::strcasecmp($va, $vb, $locale);
+			}
+
+			if ($cmp > 0)
+			{
+				return $direction;
+			}
+
+			if ($cmp < 0)
+			{
+				return -$direction;
+			}
 		}
 
-		return $a;
+		return 0;
 	}
 
 	/**
@@ -303,6 +500,23 @@ public static function sortObjects(&$a, $k, $direction = 1, $caseSensitive = tru
 	 */
 	public static function arrayUnique($myArray)
 	{
-		return is_array($myArray) ? ArrayHelper::arrayUnique($myArray) : $myArray;
+		if (!is_array($myArray))
+		{
+			return $myArray;
+		}
+
+		foreach ($myArray as &$myvalue)
+		{
+			$myvalue = serialize($myvalue);
+		}
+
+		$myArray = array_unique($myArray);
+
+		foreach ($myArray as &$myvalue)
+		{
+			$myvalue = unserialize($myvalue);
+		}
+
+		return $myArray;
 	}
 }

From 50b5955c998228f30ce3f28ee889149c4e840dcf Mon Sep 17 00:00:00 2001
From: zero-24 <zero-24@users.noreply.github.com>
Date: Tue, 17 Nov 2015 12:24:33 +0100
Subject: [PATCH 074/176] Update messages.php

---
 .../components/com_postinstall/models/messages.php       | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/administrator/components/com_postinstall/models/messages.php b/administrator/components/com_postinstall/models/messages.php
index 7eaea2b143be2..3df9b9a76b225 100644
--- a/administrator/components/com_postinstall/models/messages.php
+++ b/administrator/components/com_postinstall/models/messages.php
@@ -27,6 +27,12 @@ class PostinstallModelMessages extends FOFModel
 	 */
 	public function buildQuery($overrideLimits = false)
 	{
+		// Save the old filter order dir
+		$oldState = $this->getState('filter_order_dir', 'DESC');
+
+		// Set the filter_order_dir to bypass the check in fof
+		$this->setState('filter_order_dir', 'DESC');
+
 		$query = parent::buildQuery($overrideLimits);
 
 		$db = $this->getDbo();
@@ -38,6 +44,9 @@ public function buildQuery($overrideLimits = false)
 		// Force filter only enabled messages
 		$published = $this->getState('published', 1, 'int');
 		$query->where($db->qn('enabled') . ' = ' . $db->q($published));
+		
+		// Reset to the old state
+		$this->setState('filter_order_dir', $oldState);
 
 		return $query;
 	}

From 4abdbb87fea4f9474d00ac030b4edac04284cde7 Mon Sep 17 00:00:00 2001
From: zero-24 <zero-24@users.noreply.github.com>
Date: Tue, 17 Nov 2015 12:27:38 +0100
Subject: [PATCH 075/176] Update messages.php

---
 administrator/components/com_postinstall/models/messages.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/administrator/components/com_postinstall/models/messages.php b/administrator/components/com_postinstall/models/messages.php
index 3df9b9a76b225..505578a9d786e 100644
--- a/administrator/components/com_postinstall/models/messages.php
+++ b/administrator/components/com_postinstall/models/messages.php
@@ -44,7 +44,7 @@ public function buildQuery($overrideLimits = false)
 		// Force filter only enabled messages
 		$published = $this->getState('published', 1, 'int');
 		$query->where($db->qn('enabled') . ' = ' . $db->q($published));
-		
+
 		// Reset to the old state
 		$this->setState('filter_order_dir', $oldState);
 

From cc1ffc3177a63a34c8c78800243d414d6b229993 Mon Sep 17 00:00:00 2001
From: zero-24 <zero-24@users.noreply.github.com>
Date: Tue, 17 Nov 2015 12:32:12 +0100
Subject: [PATCH 076/176] fof i love you ;)

---
 .../components/com_postinstall/models/messages.php         | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/administrator/components/com_postinstall/models/messages.php b/administrator/components/com_postinstall/models/messages.php
index 505578a9d786e..f331ef1773eb2 100644
--- a/administrator/components/com_postinstall/models/messages.php
+++ b/administrator/components/com_postinstall/models/messages.php
@@ -28,10 +28,11 @@ class PostinstallModelMessages extends FOFModel
 	public function buildQuery($overrideLimits = false)
 	{
 		// Save the old filter order dir
-		$oldState = $this->getState('filter_order_dir', 'DESC');
+		$oldState = $this->getState('filter_order_Dir', 'DESC');
 
 		// Set the filter_order_dir to bypass the check in fof
-		$this->setState('filter_order_dir', 'DESC');
+		// As this is bad in fof please make sure the state is "filter_order_Dir" else it don't work :(
+		$this->setState('filter_order_Dir', 'DESC');
 
 		$query = parent::buildQuery($overrideLimits);
 
@@ -46,7 +47,7 @@ public function buildQuery($overrideLimits = false)
 		$query->where($db->qn('enabled') . ' = ' . $db->q($published));
 
 		// Reset to the old state
-		$this->setState('filter_order_dir', $oldState);
+		$this->setState('filter_order_Dir', $oldState);
 
 		return $query;
 	}

From 3bec4dafb77fa63772ac9d6cce4f9201e6ed66a4 Mon Sep 17 00:00:00 2001
From: zero-24 <zero-24@users.noreply.github.com>
Date: Tue, 17 Nov 2015 12:33:37 +0100
Subject: [PATCH 077/176] Update messages.php

---
 administrator/components/com_postinstall/models/messages.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/administrator/components/com_postinstall/models/messages.php b/administrator/components/com_postinstall/models/messages.php
index f331ef1773eb2..013c5a75b2124 100644
--- a/administrator/components/com_postinstall/models/messages.php
+++ b/administrator/components/com_postinstall/models/messages.php
@@ -31,7 +31,7 @@ public function buildQuery($overrideLimits = false)
 		$oldState = $this->getState('filter_order_Dir', 'DESC');
 
 		// Set the filter_order_dir to bypass the check in fof
-		// As this is bad in fof please make sure the state is "filter_order_Dir" else it don't work :(
+		// As this is hard coded in fof please make sure the state is "filter_order_Dir" else it don't work
 		$this->setState('filter_order_Dir', 'DESC');
 
 		$query = parent::buildQuery($overrideLimits);

From 4d675828f877755322b1ea97bebc3bfebb3cb63f Mon Sep 17 00:00:00 2001
From: Brian Teeman <brian@teeman.net>
Date: Tue, 17 Nov 2015 13:59:17 +0000
Subject: [PATCH 078/176] Add tooltips to icons in new com_categories view

---
 .../com_categories/views/categories/tmpl/default.php      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/administrator/components/com_categories/views/categories/tmpl/default.php b/administrator/components/com_categories/views/categories/tmpl/default.php
index 6af21b4e166ae..edcab18630dbd 100644
--- a/administrator/components/com_categories/views/categories/tmpl/default.php
+++ b/administrator/components/com_categories/views/categories/tmpl/default.php
@@ -66,25 +66,25 @@
 						<?php if (isset($this->items[0]) && property_exists($this->items[0], 'count_published')) :
 							$columns++; ?>
 							<th width="1%" class="nowrap center hidden-phone">
-								<i class="icon-publish"></i>
+								<i class="icon-publish hasTooltip" title="<?php echo JText::_('COM_CATEGORY_COUNT_PUBLISHED_ITEMS'); ?>"></i>
 							</th>
 						<?php endif;?>
 						<?php if (isset($this->items[0]) && property_exists($this->items[0], 'count_unpublished')) :
 							$columns++; ?>
 							<th width="1%" class="nowrap center hidden-phone">
-								<i class="icon-unpublish"></i>
+								<i class="icon-unpublish hasTooltip" title="<?php echo JText::_('COM_CATEGORY_COUNT_UNPUBLISHED_ITEMS'); ?>"></i>
 							</th>
 						<?php endif;?>
 						<?php if (isset($this->items[0]) && property_exists($this->items[0], 'count_archived')) :
 							$columns++; ?>
 							<th width="1%" class="nowrap center hidden-phone">
-								<i class="icon-archive"></i>
+								<i class="icon-archive hasTooltip" title="<?php echo JText::_('COM_CATEGORY_COUNT_ARCHIVED_ITEMS'); ?>"></i>
 							</th>
 						<?php endif;?>
 						<?php if (isset($this->items[0]) && property_exists($this->items[0], 'count_trashed')) :
 							$columns++; ?>
 							<th width="1%" class="nowrap center hidden-phone">
-								<i class="icon-trash"></i>
+								<i class="icon-trash hasTooltip" title="<?php echo JText::_('COM_CATEGORY_COUNT_TRASHED_ITEMS'); ?>"></i>
 							</th>
 						<?php endif;?>
 						<th width="10%" class="nowrap hidden-phone">

From 24e74982c125ccfd637ba961ee18589c304693ca Mon Sep 17 00:00:00 2001
From: Brian Teeman <brian@teeman.net>
Date: Tue, 17 Nov 2015 14:13:29 +0000
Subject: [PATCH 079/176] Update hathor

---
 .../hathor/html/com_categories/categories/default.php     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/administrator/templates/hathor/html/com_categories/categories/default.php b/administrator/templates/hathor/html/com_categories/categories/default.php
index 22d0c52f2c810..d2eb8c8081470 100644
--- a/administrator/templates/hathor/html/com_categories/categories/default.php
+++ b/administrator/templates/hathor/html/com_categories/categories/default.php
@@ -101,22 +101,22 @@
 						</th>
 						<?php if (isset($this->items[0]) && property_exists($this->items[0], 'count_published')) : ?>
 							<th width="1%" class="nowrap center hidden-phone">
-								<i class="icon-publish"></i>
+								<<i class="icon-publish hasTooltip" title="<?php echo JText::_('COM_CATEGORY_COUNT_PUBLISHED_ITEMS'); ?>"></i>
 							</th>
 						<?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"></i>
+								<i class="icon-unpublish hasTooltip" title="<?php echo JText::_('COM_CATEGORY_COUNT_UNPUBLISHED_ITEMS'); ?>"></i>
 							</th>
 						<?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"></i>
+								<i class="icon-archive hasTooltip" title="<?php echo JText::_('COM_CATEGORY_COUNT_ARCHIVED_ITEMS'); ?>"></i>
 							</th>
 						<?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"></i>
+								<i class="icon-trash hasTooltip" title="<?php echo JText::_('COM_CATEGORY_COUNT_TRASHED_ITEMS'); ?>"></i>
 							</th>
 						<?php endif;?>
 						<th class="access-col">

From 1fb580bcbee5884f06731cc5815689a95eea3f3b Mon Sep 17 00:00:00 2001
From: waader <office@multitask.at>
Date: Tue, 17 Nov 2015 15:18:00 +0100
Subject: [PATCH 080/176] Update en-GB.com_cpanel.ini

A ul tag in COM_CPANEL_WELCOME_BEGINNERS_MESSAGE is not properly closed so the "hide this message" button is not aligned left as it should. In the backend go to the post-installation messages and observe the alignment of "hide this message" buttons before and after this patch.
---
 administrator/language/en-GB/en-GB.com_cpanel.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/administrator/language/en-GB/en-GB.com_cpanel.ini b/administrator/language/en-GB/en-GB.com_cpanel.ini
index c549dfb333d81..60bc842802082 100644
--- a/administrator/language/en-GB/en-GB.com_cpanel.ini
+++ b/administrator/language/en-GB/en-GB.com_cpanel.ini
@@ -29,6 +29,6 @@ COM_CPANEL_MSG_ROBOTS_TITLE="robots.txt Update"
 COM_CPANEL_MSG_ROBOTS_BODY="A change to the default robots.txt files was made in Joomla! 3.3 to allow Google to access templates and media files by default to improve SEO. This change is not applied automatically on upgrades and users are recommended to review the changes in the robots.txt.dist file and implement these change in their own robots.txt file."
 COM_CPANEL_MSG_STATS_COLLECTION_BODY="Since Joomla! 3.5 a statistics plugin will submit anonymous data to the Joomla Project. This will only submit the Joomla version, PHP version, database engine and version, and server operating system.<br><br>This data is collected to ensure that future versions of Joomla can take advantage of the latest database and PHP features without effecting significant numbers of users. The need for this became clear when a minimum of PHP 5.3.10 was required when Joomla! 3.3 implemented the more secure Bcrypt passwords.<br><br>In the interest of full transparency and to help developers <a href="_QQ_"https://developer.joomla.org/about/stats.html"_QQ_">this data is publicly available.</a> An API and graphs will show the Joomla version, PHP versions and database engines in use.<br><br>If you do not wish to provide the Joomla Project with this information you can disable the plugin called System - Joomla Statistics."
 COM_CPANEL_MSG_STATS_COLLECTION_TITLE="Stats Collection in Joomla"
-COM_CPANEL_WELCOME_BEGINNERS_MESSAGE="<p>Community resources are available for new users</p><ul><li><a href="_QQ_"https://docs.joomla.org/Portal:Beginners"_QQ_">Joomla! Beginners Guide</a></li><li><a href="_QQ_"http://forum.joomla.org/viewforum.php?f=706"_QQ_">New to Joomla! Forum</a></li><ul>"
+COM_CPANEL_WELCOME_BEGINNERS_MESSAGE="<p>Community resources are available for new users</p><ul><li><a href="_QQ_"https://docs.joomla.org/Portal:Beginners"_QQ_">Joomla! Beginners Guide</a></li><li><a href="_QQ_"http://forum.joomla.org/viewforum.php?f=706"_QQ_">New to Joomla! Forum</a></li></ul>"
 COM_CPANEL_WELCOME_BEGINNERS_TITLE="Welcome to Joomla!"
 COM_CPANEL_XML_DESCRIPTION="Control Panel component"

From 8e04286a78d1aa58def8f93de2a5076ceaeb5520 Mon Sep 17 00:00:00 2001
From: Brian Teeman <brian@teeman.net>
Date: Tue, 17 Nov 2015 14:20:46 +0000
Subject: [PATCH 081/176] Update default.php

---
 .../templates/hathor/html/com_categories/categories/default.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/administrator/templates/hathor/html/com_categories/categories/default.php b/administrator/templates/hathor/html/com_categories/categories/default.php
index d2eb8c8081470..66c9b515d70c3 100644
--- a/administrator/templates/hathor/html/com_categories/categories/default.php
+++ b/administrator/templates/hathor/html/com_categories/categories/default.php
@@ -101,7 +101,7 @@
 						</th>
 						<?php if (isset($this->items[0]) && property_exists($this->items[0], 'count_published')) : ?>
 							<th width="1%" class="nowrap center hidden-phone">
-								<<i class="icon-publish hasTooltip" title="<?php echo JText::_('COM_CATEGORY_COUNT_PUBLISHED_ITEMS'); ?>"></i>
+								<i class="icon-publish hasTooltip" title="<?php echo JText::_('COM_CATEGORY_COUNT_PUBLISHED_ITEMS'); ?>"></i>
 							</th>
 						<?php endif;?>
 						<?php if (isset($this->items[0]) && property_exists($this->items[0], 'count_unpublished')) : ?>

From e7b7ad04ef65a391e5ba9e087204c4376d475509 Mon Sep 17 00:00:00 2001
From: Brian Teeman <brian@teeman.net>
Date: Tue, 17 Nov 2015 15:47:05 +0000
Subject: [PATCH 082/176] change layout

---
 .../views/override/tmpl/edit.php              | 34 +++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/administrator/components/com_languages/views/override/tmpl/edit.php b/administrator/components/com_languages/views/override/tmpl/edit.php
index 98e214f088fd3..3643e63b71dd9 100644
--- a/administrator/components/com_languages/views/override/tmpl/edit.php
+++ b/administrator/components/com_languages/views/override/tmpl/edit.php
@@ -49,50 +49,50 @@
 				<legend><?php echo empty($this->item->key) ? JText::_('COM_LANGUAGES_VIEW_OVERRIDE_EDIT_NEW_OVERRIDE_LEGEND') : JText::_('COM_LANGUAGES_VIEW_OVERRIDE_EDIT_EDIT_OVERRIDE_LEGEND'); ?></legend>
 				<div class="control-group">
 					<div class="control-label">
-						<?php echo $this->form->getLabel('key'); ?>
+						<?php echo $this->form->getLabel('language'); ?>
 					</div>
 					<div class="controls">
-						<?php echo $this->form->getInput('key'); ?>
+						<?php echo $this->form->getInput('language'); ?>
 					</div>
 				</div>
 
 				<div class="control-group">
 					<div class="control-label">
-						<?php echo $this->form->getLabel('override'); ?>
+						<?php echo $this->form->getLabel('client'); ?>
 					</div>
 					<div class="controls">
-						<?php echo $this->form->getInput('override'); ?>
+						<?php echo $this->form->getInput('client'); ?>
 					</div>
 				</div>
 
-				<?php if ($this->state->get('filter.client') == 'administrator') : ?>
 				<div class="control-group">
 					<div class="control-label">
-						<?php echo $this->form->getLabel('both'); ?>
+						<?php echo $this->form->getLabel('key'); ?>
 					</div>
 					<div class="controls">
-						<?php echo $this->form->getInput('both'); ?>
+						<?php echo $this->form->getInput('key'); ?>
 					</div>
 				</div>
-				<?php endif; ?>
 
-					<div class="control-group">
-						<div class="control-label">
-							<?php echo $this->form->getLabel('language'); ?>
-						</div>
-						<div class="controls">
-							<?php echo $this->form->getInput('language'); ?>
-						</div>
+				<div class="control-group">
+					<div class="control-label">
+						<?php echo $this->form->getLabel('override'); ?>
+					</div>
+					<div class="controls">
+						<?php echo $this->form->getInput('override'); ?>
 					</div>
+				</div>
 
+				<?php if ($this->state->get('filter.client') == 'administrator') : ?>
 				<div class="control-group">
 					<div class="control-label">
-						<?php echo $this->form->getLabel('client'); ?>
+						<?php echo $this->form->getLabel('both'); ?>
 					</div>
 					<div class="controls">
-						<?php echo $this->form->getInput('client'); ?>
+						<?php echo $this->form->getInput('both'); ?>
 					</div>
 				</div>
+				<?php endif; ?>
 
 				<div class="control-group">
 					<div class="control-label">

From 7ff2882e870dd0f71a4ce24830d7d219d677ebe7 Mon Sep 17 00:00:00 2001
From: zero-24 <zero-24@users.noreply.github.com>
Date: Tue, 17 Nov 2015 17:11:28 +0100
Subject: [PATCH 083/176] thanks @roland-d the code less version to fix it

---
 .../components/com_postinstall/models/messages.php  | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/administrator/components/com_postinstall/models/messages.php b/administrator/components/com_postinstall/models/messages.php
index 013c5a75b2124..ac8d30f6e33d1 100644
--- a/administrator/components/com_postinstall/models/messages.php
+++ b/administrator/components/com_postinstall/models/messages.php
@@ -27,13 +27,6 @@ class PostinstallModelMessages extends FOFModel
 	 */
 	public function buildQuery($overrideLimits = false)
 	{
-		// Save the old filter order dir
-		$oldState = $this->getState('filter_order_Dir', 'DESC');
-
-		// Set the filter_order_dir to bypass the check in fof
-		// As this is hard coded in fof please make sure the state is "filter_order_Dir" else it don't work
-		$this->setState('filter_order_Dir', 'DESC');
-
 		$query = parent::buildQuery($overrideLimits);
 
 		$db = $this->getDbo();
@@ -46,9 +39,6 @@ public function buildQuery($overrideLimits = false)
 		$published = $this->getState('published', 1, 'int');
 		$query->where($db->qn('enabled') . ' = ' . $db->q($published));
 
-		// Reset to the old state
-		$this->setState('filter_order_Dir', $oldState);
-
 		return $query;
 	}
 
@@ -136,6 +126,9 @@ protected function onProcessList(&$resultArray)
 		$unset_keys          = array();
 		$language_extensions = array();
 
+		// Order the results DESC so the newest is on the top.
+		$resultArray = array_reverse($resultArray);
+
 		foreach ($resultArray as $key => $item)
 		{
 			// Filter out messages based on dynamically loaded programmatic conditions.

From 34d1fbc27c9f017a77c3a36c14906e6e813492e6 Mon Sep 17 00:00:00 2001
From: Brian Teeman <brian@teeman.net>
Date: Tue, 17 Nov 2015 17:18:24 +0000
Subject: [PATCH 084/176] Simplify warning

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

diff --git a/administrator/language/en-GB/en-GB.com_media.ini b/administrator/language/en-GB/en-GB.com_media.ini
index fd49812a2e9c9..c3606f7101c79 100644
--- a/administrator/language/en-GB/en-GB.com_media.ini
+++ b/administrator/language/en-GB/en-GB.com_media.ini
@@ -72,8 +72,7 @@ COM_MEDIA_FILES="Files"
 COM_MEDIA_FILESIZE="File size"
 COM_MEDIA_FOLDER="Folder"
 COM_MEDIA_FOLDERS="Media Folders"
-COM_MEDIA_FOLDERS_PATH_LABEL="<strong>Warning! Path Folder</strong><br />Changing the default 'Path to files folder' to another folder other than default 'images' may break your links.<br />The 'Path to images' folder has to be the same or a subfolder of 'Path to files'."
-COM_MEDIA_IMAGE_DESCRIPTION="Image Description"
+COM_MEDIA_FOLDERS_PATH_LABEL="<strong>Warning! Path Folder</strong><br />Changing the 'Path to files folder' from the default of 'images' may break your links."
 COM_MEDIA_IMAGE_DIMENSIONS="%1$s x %2$s"
 COM_MEDIA_IMAGE_TITLE="%1$s - %2$s"
 COM_MEDIA_IMAGE_URL="Image URL"
@@ -98,4 +97,4 @@ COM_MEDIA_UPLOAD_SUCCESSFUL="Upload Successful"
 COM_MEDIA_UPLOAD="Upload"
 COM_MEDIA_UP="Up"
 COM_MEDIA_XML_DESCRIPTION="Component for managing site media"
-JLIB_RULES_SETTING_NOTES="1. Changes apply to this component only.<br /><em><strong>Inherited</strong></em> - a Global Configuration setting or higher level setting is applied.<br /><em><strong>Denied</strong></em> always wins - whatever is set at the Global or higher level and applies to all child elements.<br /><em><strong>Allowed</strong></em> will enable the action for this component unless it is overruled by a Global Configuration setting.<br /><br />2. Select Save to refresh the calculated settings."
\ No newline at end of file
+JLIB_RULES_SETTING_NOTES="1. Changes apply to this component only.<br /><em><strong>Inherited</strong></em> - a Global Configuration setting or higher level setting is applied.<br /><em><strong>Denied</strong></em> always wins - whatever is set at the Global or higher level and applies to all child elements.<br /><em><strong>Allowed</strong></em> will enable the action for this component unless it is overruled by a Global Configuration setting.<br /><br />2. Select Save to refresh the calculated settings."

From 962f7a44a67e302f82511e8ff24c9955fde258f6 Mon Sep 17 00:00:00 2001
From: Brian Teeman <brian@teeman.net>
Date: Tue, 17 Nov 2015 17:20:48 +0000
Subject: [PATCH 085/176] Update en-GB.com_media.ini

---
 administrator/language/en-GB/en-GB.com_media.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/administrator/language/en-GB/en-GB.com_media.ini b/administrator/language/en-GB/en-GB.com_media.ini
index c3606f7101c79..e3b78f721d77b 100644
--- a/administrator/language/en-GB/en-GB.com_media.ini
+++ b/administrator/language/en-GB/en-GB.com_media.ini
@@ -72,7 +72,7 @@ COM_MEDIA_FILES="Files"
 COM_MEDIA_FILESIZE="File size"
 COM_MEDIA_FOLDER="Folder"
 COM_MEDIA_FOLDERS="Media Folders"
-COM_MEDIA_FOLDERS_PATH_LABEL="<strong>Warning! Path Folder</strong><br />Changing the 'Path to files folder' from the default of 'images' may break your links."
+COM_MEDIA_FOLDERS_PATH_LABEL="<strong>Warning! Path Folder</strong><br />Changing the 'Path to files folder' from the default of 'images' may break your links.<br />The 'Path to images' folder has to be the same or a subfolder of 'Path to files'."
 COM_MEDIA_IMAGE_DIMENSIONS="%1$s x %2$s"
 COM_MEDIA_IMAGE_TITLE="%1$s - %2$s"
 COM_MEDIA_IMAGE_URL="Image URL"

From 64f76a11c54a19e265c6214cb7d82d3decdf0955 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wojciech=20Smoli=C5=84ski?= <wojsmol@wp.pl>
Date: Tue, 17 Nov 2015 18:44:14 +0100
Subject: [PATCH 086/176] fix for joomla#8456

Simple fix for joomla#8456. For details see that issue.
---
 libraries/legacy/model/list.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/legacy/model/list.php b/libraries/legacy/model/list.php
index 7d4b33016cacf..b5828eaaecb65 100644
--- a/libraries/legacy/model/list.php
+++ b/libraries/legacy/model/list.php
@@ -698,7 +698,7 @@ public function getUserStateFromRequest($key, $request, $default = null, $type =
 			$name    = substr($request, 7);
 			$filters = $app->input->get('filter', array(), 'array');
 
-			if (isset($filters[$name]) && $filters[$name] !== '')
+			if (isset($filters[$name]))
 			{
 				$new_state = $filters[$name];
 			}

From 4e4a7605d818283449e5c0681b1dd8dff6d294db Mon Sep 17 00:00:00 2001
From: matrikular <kontakt@sven-hurt.de>
Date: Tue, 17 Nov 2015 19:18:36 +0100
Subject: [PATCH 087/176] Refactor the form layout to make use of the
 renderField method

The following changes were made to this file, starting from the top:
- Removed the error-handle code block at the top that seemed to be left over from Joomla! 1.6
- Added the well CSS class suffix to the form to match the output / markup of com_users.registration and login
- Rewritten the foreach loop to fetch the fieldset and field information from the xml file and make use of the renderField method
- Adjusted the markup containing the button and hidden field/s to match the output / markup of com_users.registration and login
---
 .../views/contact/tmpl/default_form.php       | 54 ++++++++-----------
 1 file changed, 21 insertions(+), 33 deletions(-)

diff --git a/components/com_contact/views/contact/tmpl/default_form.php b/components/com_contact/views/contact/tmpl/default_form.php
index 23055078ca3f8..93a817fa454b3 100644
--- a/components/com_contact/views/contact/tmpl/default_form.php
+++ b/components/com_contact/views/contact/tmpl/default_form.php
@@ -9,44 +9,31 @@
 
 defined('_JEXEC') or die;
 
+use \Joomla\String\StringHelper;
+
 JHtml::_('behavior.keepalive');
 JHtml::_('behavior.formvalidator');
-
-if (isset($this->error)) : ?>
-	<div class="contact-error">
-		<?php echo $this->error; ?>
-	</div>
-<?php endif; ?>
-
+?>
 <div class="contact-form">
-	<form id="contact-form" action="<?php echo JRoute::_('index.php'); ?>" method="post" class="form-validate form-horizontal">
-		<fieldset>
-			<legend><?php echo JText::_('COM_CONTACT_FORM_LABEL'); ?></legend>
-
-			<?php foreach ($this->form->getFieldsets() as $fieldset) : ?>
-				<?php foreach ($this->form->getFieldset($fieldset->name) as $field) : ?>
-					<?php if ($field->name === 'contact_email_copy' && !$this->params->get('show_email_copy')) : ?>
-						<?php continue; ?>
+	<form id="contact-form" action="<?php echo JRoute::_('index.php'); ?>" method="post" class="form-validate form-horizontal well">
+		<?php foreach ($this->form->getFieldsets() as $fieldset): ?>
+			<?php $fields = $this->form->getFieldset($fieldset->name); ?>
+			<?php if (count($fields)) : ?>
+				<fieldset>
+					<?php if (isset($fieldset->label) && StringHelper::strlen($legend = trim(JText::_($fieldset->label)))) : ?>
+						<legend><?php echo $legend; ?></legend>
 					<?php endif; ?>
-					<div class="control-group">
-						<?php if ($field->hidden) : ?>
-							<div class="controls">
-								<?php echo $field->input; ?>
-							</div>
-						<?php else: ?>
-							<div class="control-label">
-								<?php echo $field->label; ?>
-								<?php if (!$field->required && $field->type != 'Spacer') : ?>
-									<span class="optional"><?php echo JText::_('COM_CONTACT_OPTIONAL'); ?></span>
-								<?php endif; ?>
-							</div>
-							<div class="controls"><?php echo $field->input; ?></div>
+					<?php foreach ($fields as $field) : ?>
+						<?php if ($field->name === 'contact_email_copy' && !$this->params->get('show_email_copy')) : ?>
+							<?php continue; ?>
 						<?php endif; ?>
-					</div>
-				<?php endforeach; ?>
-			<?php endforeach; ?>
-
-			<div class="form-actions">
+						<?php echo $field->renderField(); ?>
+					<?php endforeach; ?>
+				</fieldset>
+			<?php endif; ?>
+		<?php endforeach; ?>
+		<div class="control-group">
+			<div class="controls">
 				<button class="btn btn-primary validate" type="submit"><?php echo JText::_('COM_CONTACT_CONTACT_SEND'); ?></button>
 				<input type="hidden" name="option" value="com_contact" />
 				<input type="hidden" name="task" value="contact.submit" />
@@ -54,6 +41,7 @@
 				<input type="hidden" name="id" value="<?php echo $this->contact->slug; ?>" />
 				<?php echo JHtml::_('form.token'); ?>
 			</div>
+		</div>
 		</fieldset>
 	</form>
 </div>

From 66c5380057098642736fd390fc02dc44c338f3eb Mon Sep 17 00:00:00 2001
From: Thomas Hunziker <werbemails@bakual.ch>
Date: Tue, 17 Nov 2015 20:01:36 +0100
Subject: [PATCH 088/176] Updated installation language files and added Irish
 (ga-IE)

---
 installation/language/bg-BG/bg-BG.ini |  47 ++--
 installation/language/bg-BG/bg-BG.xml |   4 +-
 installation/language/ca-ES/ca-ES.ini |   4 +-
 installation/language/ca-ES/ca-ES.xml |   4 +-
 installation/language/da-DK/da-DK.ini |  90 +++++---
 installation/language/da-DK/da-DK.xml |   4 +-
 installation/language/de-DE/de-DE.ini |   8 +-
 installation/language/de-DE/de-DE.xml |   4 +-
 installation/language/en-AU/en-AU.ini |   2 +-
 installation/language/en-AU/en-AU.xml |   4 +-
 installation/language/en-CA/en-CA.ini |   2 +-
 installation/language/en-CA/en-CA.xml |   4 +-
 installation/language/en-GB/en-GB.xml |   4 +-
 installation/language/en-US/en-US.ini |   2 +-
 installation/language/en-US/en-US.xml |   4 +-
 installation/language/fa-IR/fa-IR.ini |  10 +-
 installation/language/fa-IR/fa-IR.xml |   4 +-
 installation/language/ga-IE/ga-IE.ini | 321 ++++++++++++++++++++++++++
 installation/language/ga-IE/ga-IE.xml |  21 ++
 installation/language/hy-AM/hy-AM.ini |  18 +-
 installation/language/hy-AM/hy-AM.xml |   6 +-
 installation/language/it-IT/it-IT.ini |   2 +-
 installation/language/it-IT/it-IT.xml |   4 +-
 installation/language/km-KH/km-KH.ini |  12 +-
 installation/language/km-KH/km-KH.xml |   4 +-
 installation/language/ko-KR/ko-KR.ini |   2 +-
 installation/language/ko-KR/ko-KR.xml |   4 +-
 installation/language/mk-MK/mk-MK.ini |   2 +-
 installation/language/mk-MK/mk-MK.xml |   4 +-
 installation/language/pt-BR/pt-BR.ini |  11 +-
 installation/language/pt-BR/pt-BR.xml |   4 +-
 installation/language/sk-SK/sk-SK.ini |   2 +-
 installation/language/sk-SK/sk-SK.xml |   4 +-
 installation/language/sr-RS/sr-RS.ini |  15 +-
 installation/language/sr-RS/sr-RS.xml |   4 +-
 installation/language/sr-YU/sr-YU.ini |  15 +-
 installation/language/sr-YU/sr-YU.xml |   4 +-
 installation/language/sv-SE/sv-SE.ini |   8 +-
 installation/language/sv-SE/sv-SE.xml |   4 +-
 installation/language/ta-IN/ta-IN.ini |   4 +-
 installation/language/ta-IN/ta-IN.xml |   4 +-
 installation/language/tk-TM/tk-TM.ini |   4 +-
 installation/language/tk-TM/tk-TM.xml |  16 +-
 media/mod_languages/images/ga_ie.gif  | Bin 0 -> 1380 bytes
 44 files changed, 545 insertions(+), 155 deletions(-)
 create mode 100644 installation/language/ga-IE/ga-IE.ini
 create mode 100644 installation/language/ga-IE/ga-IE.xml
 create mode 100644 media/mod_languages/images/ga_ie.gif

diff --git a/installation/language/bg-BG/bg-BG.ini b/installation/language/bg-BG/bg-BG.ini
index 97273780ddc36..45f85ef7ccdfe 100644
--- a/installation/language/bg-BG/bg-BG.ini
+++ b/installation/language/bg-BG/bg-BG.ini
@@ -3,16 +3,13 @@
 ; License GNU General Public License version 2 or later; see LICENSE.txt
 ; Note : All ini files need to be saved as UTF-8
 
-
-
 ;Stepbar
+INSTL_STEP_COMPLETE_LABEL="Край"
 INSTL_STEP_DATABASE_LABEL="База данни"
 INSTL_STEP_DEFAULTLANGUAGE_LABEL="Изберете език на сайта"
-INSTL_STEP_LANGUAGE_LABEL="Език"
-INSTL_STEP_LANGUAGES_LABEL="Инсталиране на езици"
 INSTL_STEP_FTP_LABEL="FTP"
+INSTL_STEP_LANGUAGES_LABEL="Инсталиране на езици"
 INSTL_STEP_SITE_LABEL="Конфигурация"
-INSTL_STEP_COMPLETE_LABEL="Край"
 INSTL_STEP_SUMMARY_LABEL="Преглед"
 
 ;Language view
@@ -60,7 +57,6 @@ INSTL_FTP_ROOT_LABEL="Път до основната папка за FTP"
 INSTL_FTP_SAVE_LABEL="Запис на FTP паролата"
 INSTL_FTP_TITLE="FTP Настройки (<strong class="_QQ_"red"_QQ_">По избор - повечето потребители могат да пропуснат тази стъпка. Натиснете напред, за да я пропуснете.</strong>)"
 INSTL_FTP_USER_LABEL="FTP потребител"
-INSTL_SITE_NAME_LABEL="Име на сайта"
 INSTL_VERIFY_FTP_SETTINGS="Проверка на FTP настройките"
 INSTL_FTP_SETTINGS_CORRECT="Настройките са коректни"
 INSTL_FTP_USER_DESC="ВНИМАНИЕ! Препоръчваме Ви да оставите полето празно и да въвеждате потребителското си име и парола за FTP достъп всеки път, когато качвате файлове."
@@ -75,6 +71,7 @@ INSTL_ADMIN_PASSWORD_DESC="Въведете парола на супер адм
 INSTL_ADMIN_PASSWORD2_LABEL="Потвърдете паролата"
 INSTL_ADMIN_USER_LABEL="Потребителско име на администратора"
 INSTL_ADMIN_USER_DESC="Може да смените стандартното потребителско име <strong>admin</strong>."
+INSTL_SITE_NAME_LABEL="Име на сайта"
 INSTL_SITE_NAME_DESC="Въведете името на Вашият Джумла! сайт.<br />Ако желаете може да въведете и мета описание и мета ключови думи.<br />Може да изберете и дали сайтът да бъде видим веднага или да бъде пуснат в режим за поддръжка, след като приключи инсталацията."
 INSTL_SITE_METADESC_LABEL="Мета описание"
 INSTL_SITE_METADESC_TITLE_LABEL="Въведете описание на Вашият уеб сайт, което се ползва от търсачките. В общият случай максимум 20 думи са достатъчни."
@@ -83,11 +80,17 @@ INSTL_SITE_OFFLINE_TITLE_LABEL="Спрете сайта за поддръжка
 INSTL_SITE_INSTALL_SAMPLE_LABEL="Инсталиране на примерни данни"
 INSTL_SITE_INSTALL_SAMPLE_DESC="Ако нямате опит с Джумла! Ви съветваме да инсталирате примерните данни. Те ще Ви помогнат да се ориентирате по-добре и по-лесно в системата."
 INSTL_SITE_INSTALL_SAMPLE_NONE="Николко (<strong>Задължителен избор, ако искате да инсталирате сайта като мултиезичен</strong>)"
-INSTL_SAMPLE_DATA_SET="По подразбиране - примерни данни на английски."
 INSTL_SAMPLE_BLOG_SET="Блог Английски (GB) Примерни данни"
 INSTL_SAMPLE_BROCHURE_SET="Брошура Английски (GB) Примерни данни"
+INSTL_SAMPLE_DATA_SET="По подразбиране - примерни данни на английски."
 INSTL_SAMPLE_LEARN_SET="Научете примерните данни на английски (GB)"
 INSTL_SAMPLE_TESTING_SET="Тествайте примерните данни на английски (GB)"
+INSTL_SITE_INSTALL_SAMPLE_NONE_DESC="Инсталирайте Джумла само с едно меню и форма за вход, без всякакво съдържание."
+INSTL_SAMPLE_BLOG_SET_DESC="Инсталирайте Джумла с няколко статии и модули тип блог, като например Стари Статии, Най-четени статии."
+INSTL_SAMPLE_BROCHURE_SET_DESC="Инсталирайте Джумла с няколко страници (менюта тип Начало, За нас, Новини, Контакти) и модули като Търсене, Примерен код, Вход."
+INSTL_SAMPLE_DATA_SET_DESC="Инсталирайте Джумла с една страница (меню с една страница) и модули като Последни статии, Вход."
+INSTL_SAMPLE_LEARN_SET_DESC="Инсталирайте Джумла с примерни статии, които описват как работи Джумла."
+INSTL_SAMPLE_TESTING_SET_DESC="Инсталирайте Джумла с всички възможни видове менюта, за да помогнете в тестването на Джумла."
 
 ;Summary view
 INSTL_FINALISATION="Финализиране"
@@ -113,13 +116,19 @@ INSTL_EMAIL_NOT_SENT="Е-мейлът не може да бъде изпрате
 
 ;Complete view
 INSTL_COMPLETE_ADMINISTRATION_LOGIN_DETAILS="Данни на администратора за вход"
+; The word 'installation' should not be translated as it is a physical folder.
 INSTL_COMPLETE_ERROR_FOLDER_ALREADY_REMOVED="Папка installation вече е изтрита."
+; The word 'installation' should not be translated as it is a physical folder.
 INSTL_COMPLETE_ERROR_FOLDER_DELETE="Папка installation не може да бъде изтрита. Моля изтрийте ръчно тази папка."
+; The word 'installation' should not be translated as it is a physical folder.
 INSTL_COMPLETE_FOLDER_REMOVED="Папка installation е изтрита успешно"
 INSTL_COMPLETE_LANGUAGE_1="Джумла! на Вашия език и/или автоматично създаване на мултиезичен сайт"
+; The word 'installation' should not be translated as it is a physical folder.
 INSTL_COMPLETE_LANGUAGE_DESC="Преди да премахнете папка installation може да инсталирате допълнителни езици. Ако желаете да го направите натиснете бутона."
 INSTL_COMPLETE_LANGUAGE_DESC2="Внимание: ще е нужна връзка с интернет, за да свалите и инсталирате новите езици. <br/>Някои сървърни конфигурации не позволяват този тип инсталиране на файлове. Ако това е вашият случай, не се притеснявайте. Може да инсталирате допълнителни езици по всяко време използвайки инсталатора на Джумла!"
+; The word 'installation' should not be translated as it is a physical folder.
 INSTL_COMPLETE_REMOVE_FOLDER="Изтрийте папка installation"
+; The word 'installation' should not be translated as it is a physical folder.
 INSTL_COMPLETE_REMOVE_INSTALLATION="МОЛЯ ИЗТРИЙТЕ ИЛИ ПРЕИМЕНУВАЙТЕ ПАПКА<br />installation.<br />Няма да може да продължите напред, докато папката "_QQ_"installation"_QQ_" съществува. Това е от съображения за сигурност в Джумла!"
 INSTL_COMPLETE_TITLE="Поздравления, Джумла! вече е инсталирана."
 INSTL_COMPLETE_INSTALL_LANGUAGES="Допълнителни стъпки: Инсталиране на езици"
@@ -130,13 +139,13 @@ INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE="Език"
 INSTL_LANGUAGES_COLUMN_HEADER_VERSION="Версия"
 INSTL_LANGUAGES_DESC="Джумла е преведена на много езици. Изберете предпочитаните от Вас езици и натиснете бутона Напред.<br/>Внимание: тази операция ще отнеме около 10 секунди за инсталиране на всеки език. Моля не избирайте повече от 3 езики, за да избегнете проблеми със сървъра."
 INSTL_LANGUAGES_MESSAGE_PLEASE_WAIT="Tази операция ще отнеме около 5 секунди за инсталиране на всеки език.<br />Моля изчакайте, докато избраните езици се свалят и инсталират..."
+INSTL_LANGUAGES_MORE_LANGUAGES="Натиснете бутона 'Назад', ако искате да инсталирате още езици"
 INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="Не са озбрани езици за инсталиране. Ако желаете да инсталирате допълнителни езици натиснете бутона Назад"
 INSTL_LANGUAGES_WARNING_NO_INTERNET="Няма връзка с езиковия сървър. Моля довършете инсталационния процес."
 INSTL_LANGUAGES_WARNING_NO_INTERNET2="Внимание: Може да инсталирате езици по-късно от администрацията на сайта."
 INSTL_LANGUAGES_WARNING_BACK_BUTTON="Връщане към последната стъпка на инсталацията"
 
-;Defaultlanguage view
-INSTL_LANGUAGES_MORE_LANGUAGES="Натиснете бутона 'Назад', ако искате да инсталирате още езици"
+;Default language view
 INSTL_DEFAULTLANGUAGE_ACTIVATE_MULTILANGUAGE="Активирайте вградената мултиезичност"
 INSTL_DEFAULTLANGUAGE_ACTIVATE_MULTILANGUAGE_DESC="Ако е активно, сайтът ще има пусната мултиезичност с локализируеми менюта за всеки инсталиран език."
 INSTL_DEFAULTLANGUAGE_ACTIVATE_LANGUAGE_CODE_PLUGIN="Включване на добавката за мултиезичност"
@@ -156,10 +165,9 @@ INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_ARTICLE="Неуспешно автома
 INSTL_DEFAULTLANGUAGE_COULD_NOT_ENABLE_MODULESWHITCHER_LANGUAGECODE="Неуспешно автоматично публикуване на модула за смяна на езиците"
 INSTL_DEFAULTLANGUAGE_COULD_NOT_ENABLE_PLG_LANGUAGECODE="Неуспешно активиране на добавката за езиков код"
 INSTL_DEFAULTLANGUAGE_COULD_NOT_ENABLE_PLG_LANGUAGEFILTER="Неуспешно активиране на добавката за филтриране на езиците"
-INSTL_DEFAULTLANGUAGE_COULD_NOT_INSTALL_LANGUAGE="Неуспешно инсталиране на %s език"
+INSTL_DEFAULTLANGUAGE_COULD_NOT_INSTALL_LANGUAGE="Не може да бъде намерен %s инсталационен файл."
 INSTL_DEFAULTLANGUAGE_COULD_NOT_PUBLISH_MOD_MULTILANGSTATUS="Неуспешно автоматично публикуване на модула за статус на езиците"
 INSTL_DEFAULTLANGUAGE_COULD_NOT_UNPUBLISH_MOD_DEFAULTMENU="Неуспешно деактивиране на модула на менюто по подразбиране"
-INSTL_DEFAULTLANGUAGE_COULD_NOT_INSTALL_LANGUAGE="Не може да бъде намерен %s инсталационен файл."
 INSTL_DEFAULTLANGUAGE_DESC="Инсталирани са следните езици. Моля изберете език, който да бъде зададен по подразбиране за административната част."
 INSTL_DEFAULTLANGUAGE_DESC_FRONTEND="Инсталирани са следните езици. Моля изберете език, който да бъде зададен по подразбиране за сайт частта."
 INSTL_DEFAULTLANGUAGE_FRONTEND="Език по подразбиране за сайта"
@@ -176,6 +184,7 @@ INSTL_DEFAULTLANGUAGE_NATIVE_LANGUAGE_NAME="Български"
 
 ;Database Model
 INSTL_DATABASE_COULD_NOT_CONNECT="Не може да бъде осъществена връзка с базата данни. При свързването бе получена грешка с номер: %s"
+INSTL_DATABASE_COULD_NOT_CREATE_DATABASE="Инсталаторът не може да се свърже с указаната база данни и не може да я създаде. Моля проверете настройките си и ако е необходимо създайте базата си ръчно."
 INSTL_DATABASE_COULD_NOT_REFRESH_MANIFEST_CACHE="Не може да се обнови кешът на разширение: %s"
 INSTL_DATABASE_EMPTY_NAME=""
 INSTL_DATABASE_ERROR_BACKINGUP="Появиха се някои грешки при създаването на бекъп на базата данни."
@@ -187,6 +196,8 @@ INSTL_DATABASE_FIX_TOO_LONG="Представката на таблиците м
 INSTL_DATABASE_INVALID_DB_DETAILS="Данните за базата данни са грешни или празни."
 INSTL_DATABASE_INVALID_MYSQL_VERSION="Необходимо е да имате MySQL 5.0.4 или по-висока версия, за да продължите с инсталацията. Вашата версия е: %s"
 INSTL_DATABASE_INVALID_MYSQLI_VERSION="Необходимо е да имате MySQL 5.0.4 или по-висока версия, за да продължите с инсталацията. Вашата версия е: %s"
+INSTL_DATABASE_INVALID_PDOMYSQL_VERSION="Необходимо е да имате MySQL 5.0.4 или по-висока версия, за да продължите с инсталацията. Вашата версия е: %s"
+INSTL_DATABASE_INVALID_POSTGRESQL_VERSION="Необходимо е да имате PostgreSQL 8.3.18 или по-висока версия, за да продължите с инсталацията. Вашата версия е: %s"
 INSTL_DATABASE_INVALID_SQLSRV_VERSION="Необходим е SQL Server 2008 R2 (10.50.1600.1) или по-нова версия, за да продължите с инсталацията. Вашата версия е: %s"
 INSTL_DATABASE_INVALID_SQLZURE_VERSION="Необходим е SQL Server 2008 R2 (10.50.1600.1) или по-нова версия, за да продължите с инсталацията. Вашата версия е: %s"
 INSTL_DATABASE_INVALID_TYPE="Моля изберете вид на базата данни."
@@ -243,6 +254,7 @@ INSTL_NOTICEYOUCANSTILLINSTALL="<br />Все още можете да продъ
 INSTL_OUTPUT_BUFFERING="Изходящ буфер"
 INSTL_PARSE_INI_FILE_AVAILABLE="Поддръжка на INI парсване"
 INSTL_PHP_VERSION="Версия на PHP"
+INSTL_PHP_VERSION_NEWER="PHP версия >= %s"
 INSTL_REGISTER_GLOBALS="Регистриране на глобалните"
 INSTL_SAFE_MODE="Сигурен режим"
 INSTL_SESSION_AUTO_START="Автоматично стартиране на сесията"
@@ -259,10 +271,10 @@ JERROR="Грешка"
 JEMAIL="Е-мейл"
 JGLOBAL_ISFREESOFTWARE="%s е безплатен софтуер, разпространяван под <a href="_QQ_"http://www.gnu.org/licenses/gpl-2.0.html"_QQ_">ГНУ Общ публичен лиценз</a>."
 JGLOBAL_LANGUAGE_VERSION_NOT_PLATFORM="Езиковият пакет не е за тази версия на Джумла. Някои езикови стрингове липсват."
-JINVALID_TOKEN="Последната заявка бе отказана, защото съдържаше невалиден код за сигурност. Моля презаредете страницата и опитайте отново."
 JGLOBAL_SELECT_AN_OPTION="Изберете опция"
 JGLOBAL_SELECT_NO_RESULTS_MATCH="Няма намерени резултати"
 JGLOBAL_SELECT_SOME_OPTIONS="Изберте някои опции"
+JINVALID_TOKEN="Последната заявка бе отказана, защото съдържаше невалиден код за сигурност. Моля презаредете страницата и опитайте отново."
 JNEXT="Напред"
 JNO="Не"
 JNOTICE="Забележка"
@@ -274,24 +286,25 @@ JUSERNAME="Потребителско име"
 JYES="Да"
 
 ; Framework strings necessary when no lang pack is available
-JLIB_DATABASE_ERROR_DATABASE="Възникна грешка в базата данни."
 JLIB_DATABASE_ERROR_CONNECT_MYSQL="Не може да бъде осъществена връзка с MySQL сървъра."
+JLIB_DATABASE_ERROR_DATABASE="Възникна грешка в базата данни."
 JLIB_DATABASE_ERROR_LOAD_DATABASE_DRIVER="Неуспешно зареждане на драйверите за връзка с базата данни: %s"
 JLIB_ENVIRONMENT_SESSION_EXPIRED="Сесията Ви изтече, моля презаредете страницата."
 JLIB_FILESYSTEM_ERROR_COPY_FAILED="Копирането е неуспешно"
 JLIB_FILESYSTEM_ERROR_PATH_IS_NOT_A_FOLDER_FILES="JFolder: :файлове: Пътят не е папка. Път: %s"
 JLIB_FORM_FIELD_INVALID="Невалидно поле:&#160;"
-JLIB_FORM_VALIDATE_FIELD_REQUIRED="Полето е задължително: %s"
 JLIB_FORM_VALIDATE_FIELD_INVALID="Грешно въведени данни: %s"
+JLIB_FORM_VALIDATE_FIELD_REQUIRED="Полето е задължително: %s"
 JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :Инсталиране: Неуспешно копиране на файлове %1$s към %2$s."
+JLIB_INSTALLER_NOT_ERROR="Ако грешката е свързана с инсталирането на езиковите файлове на TinyMCE, то тя няма ефект върху инсталирането на езика(езиците). Някои езикови пакет, създадени преди Джумла 3.2.0 може да се опитват да инсталират отделни TinyMCE езикови файлове. Тъй като тези вече са част от ядрото, няма нужда да бъдат инсталирани отделно."
 JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: Не може да бъде осъществена връзка с базата данни <br />joomla.library: %1$s - %2$s"
 
-;Strings for the language debugger
+; Strings for the language debugger
 JDEBUG_LANGUAGE_FILES_IN_ERROR="Грешка при парсването на езиковите файлове"
 JDEBUG_LANGUAGE_UNTRANSLATED_STRING="Непреведени езикови стрингове"
 JNONE="Няма"
 
-;Necessary for errors
+; Necessary for errors
 ADMIN_EMAIL="Вашият е-мейл"
 ADMIN_PASSWORD="Парола на администратора"
 ADMIN_PASSWORD2="Потвърдете паролата"
@@ -301,7 +314,9 @@ SITE_NAME="Име на сайта"
 MYSQL="MySQL"
 MYSQLI="MySQLi"
 ORACLE="Oracle"
+PDOMYSQL="MySQL (PDO)"
 POSTGRESQL="PostgreSQL"
 SQLAZURE="Microsoft SQL Azure"
 SQLITE="SQLite"
 SQLSRV="Microsoft SQL Сървър"
+
diff --git a/installation/language/bg-BG/bg-BG.xml b/installation/language/bg-BG/bg-BG.xml
index 92a5b5d7076fb..55410cc614746 100644
--- a/installation/language/bg-BG/bg-BG.xml
+++ b/installation/language/bg-BG/bg-BG.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <metafile
-	version="3.4"
+	version="3.5"
 	client="installation">
 	<name>Bulgarian (Български)</name>
-	<version>3.4.4</version>
+	<version>3.5.0</version>
 	<creationDate>August 2015</creationDate>
 	<author>Yuriy Boev</author>
 	<copyright>Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved.</copyright>
diff --git a/installation/language/ca-ES/ca-ES.ini b/installation/language/ca-ES/ca-ES.ini
index ea307c0b5974d..3f6443d195fbb 100644
--- a/installation/language/ca-ES/ca-ES.ini
+++ b/installation/language/ca-ES/ca-ES.ini
@@ -87,7 +87,7 @@ INSTL_SAMPLE_LEARN_SET="Dades de mostra Aprendre Joomla en anglès (GB)"
 INSTL_SAMPLE_TESTING_SET="Dades de mostra de Prova en Anglès (GB)"
 INSTL_SITE_INSTALL_SAMPLE_NONE_DESC="Instal·lar Joomla amb només un menú i formulari d'entrada sense cap contingut."
 INSTL_SAMPLE_BLOG_SET_DESC="Instal·lar Joomla amb alguns articles i mòduls d'estil blog tals com articles anteriors,enllaços,articles més llegits...."
-INSTL_SAMPLE_BROCHURE_SET_DESC="Instal·lar Joomla amb algunes pàgines (un menú amb pàgines tipus inici, sobre nosaltres,notícies,contacta'ns) i mòduls com cerca, codi html, formulari d'entrada."
+INSTL_SAMPLE_BROCHURE_SET_DESC="Instal·lar Joomla amb algunes pàgines (un menú amb pàgines tipus inici, sobre nosaltres, notícies, contacta'ns) i mòduls com cerca, codi, formulari d'entrada."
 INSTL_SAMPLE_DATA_SET_DESC="Instal·lar Joomla amb una pàgina (menú amb un enllaç) i mòduls tals com Darrer article, formulari d'entrada."
 INSTL_SAMPLE_LEARN_SET_DESC="Instal·lar Joomla amb articles d'exemple que descriuen com funciona Joomla."
 INSTL_SAMPLE_TESTING_SET_DESC="Instal·la Joomla amb tots els ítems de menú possibles per provar Joomla."
@@ -186,7 +186,7 @@ INSTL_DEFAULTLANGUAGE_NATIVE_LANGUAGE_NAME="Català (ES)"
 INSTL_DATABASE_COULD_NOT_CONNECT="No s'ha pogut connectar a la base de dades. Connector retornat número : %s"
 INSTL_DATABASE_COULD_NOT_CREATE_DATABASE="L'instal·lador no pot connectar a la base de dades especificada i no ha pogut crear la base de dades. Comprova la configuració i si és necessari crea manualment la base de dades."
 INSTL_DATABASE_COULD_NOT_REFRESH_MANIFEST_CACHE="No s'ha pogut actualitzar la memòria cau per l'extensió: %s"
-INSTL_DATABASE_EMPTY_NAME=" "
+INSTL_DATABASE_EMPTY_NAME=""
 INSTL_DATABASE_ERROR_BACKINGUP="Ha hagut alguns errors en la còpia de seguretat de la base de dades."
 INSTL_DATABASE_ERROR_CREATE="S'ha produït un error en intentar crear la base de dades %s.<br/>L'usuari/a no té suficients privilegis per crear una base de dades. La base de dades requerida pot ser necessari crear-la per separat abans de poder instal·lar Joomla."
 INSTL_DATABASE_ERROR_DELETE="Ha hagut alguns errors esborrant la base de dades."
diff --git a/installation/language/ca-ES/ca-ES.xml b/installation/language/ca-ES/ca-ES.xml
index d2c6d1b05292d..ed554bee95a9f 100644
--- a/installation/language/ca-ES/ca-ES.xml
+++ b/installation/language/ca-ES/ca-ES.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <metafile
-	version="3.4"
+	version="3.5"
 	client="installation">
 	<name>Catalan (ES)</name>
-	<version>3.4.4</version>
+	<version>3.5.0</version>
 	<creationDate>August 2015</creationDate>
 	<author>Catalan Translation Team</author>
 	<copyright>Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved.</copyright>
diff --git a/installation/language/da-DK/da-DK.ini b/installation/language/da-DK/da-DK.ini
index cc23803956558..61cf6dfeb4297 100644
--- a/installation/language/da-DK/da-DK.ini
+++ b/installation/language/da-DK/da-DK.ini
@@ -2,8 +2,8 @@
 ; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt
 ; Note : All ini files need to be saved as UTF-8
-; Stepbar
 
+;Stepbar
 INSTL_STEP_COMPLETE_LABEL="Afslutning"
 INSTL_STEP_DATABASE_LABEL="Database"
 INSTL_STEP_DEFAULTLANGUAGE_LABEL="Vælg standardsprog"
@@ -11,11 +11,13 @@ INSTL_STEP_FTP_LABEL="FTP"
 INSTL_STEP_LANGUAGES_LABEL="Installer sprog"
 INSTL_STEP_SITE_LABEL="Konfiguration"
 INSTL_STEP_SUMMARY_LABEL="Oversigt"
-; Language view
+
+;Language view
 INSTL_SELECT_LANGUAGE_TITLE="Vælg sprog"
 INSTL_WARNJAVASCRIPT="Advarsel! JavaScript skal være aktiveret for korrekt installation af Joomla!"
 INSTL_WARNJSON="Din PHP installation skal have JSON aktiveret for at Joomla kan installeres!"
-; Preinstall view
+
+;Preinstall view
 INSTL_PRECHECK_TITLE="Pre-installation"
 INSTL_PRECHECK_DESC="Hvis nogle af disse elementer ikke er understøttet (markeret som <strong class="_QQ_"label label-important"_QQ_">Nej</strong>) så tag venligst handling for at rette dem. <br />Du kan ikke installere Joomla! før dit setup opfylder kravene nedenfor."
 INSTL_PRECHECK_RECOMMENDED_SETTINGS_TITLE="Anbefalede indstillinger:"
@@ -23,9 +25,10 @@ INSTL_PRECHECK_RECOMMENDED_SETTINGS_DESC="Disse indstillinger er anbefalet for P
 INSTL_PRECHECK_DIRECTIVE="Direktiv"
 INSTL_PRECHECK_RECOMMENDED="Anbefalet"
 INSTL_PRECHECK_ACTUAL="Aktuel"
+
 ; Database view
 INSTL_DATABASE="Databasekonfiguration"
-INSTL_DATABASE_HOST_DESC="Dette er typisk &quot;localhost&quot;."
+INSTL_DATABASE_HOST_DESC="Dette er typisk "_QQ_"localhost"_QQ_"."
 INSTL_DATABASE_HOST_LABEL="Hostnavn"
 INSTL_DATABASE_NAME_DESC="Nogle webhosts tillader kun et bestemt databasenavn pr websted. Anvend tabelprefiks i disse situationer for at køre flere Joomla! websteder fra samme database."
 INSTL_DATABASE_NAME_LABEL="Databasenavn"
@@ -37,11 +40,12 @@ INSTL_DATABASE_PASSWORD_LABEL="Adgangskode"
 INSTL_DATABASE_PREFIX_DESC="Vælg et database præfiks eller anvend det <b>tilfældigt genererede</b>. Optimalt, tre eller fire karakterers længde, kun indeholdende alfanumeriske karakterer, og SKAL slutte med understregning. <b>Vær sikker på at det valgte prefiks ikke anvendes af andre tabeller i databasen</b>."
 INSTL_DATABASE_PREFIX_LABEL="Tabelpræfiks"
 INSTL_DATABASE_PREFIX_MSG="Databasepræfiks skal starte med et bogstav, efterfulgt af valgfri alphanumeriske karakterer og en afsluttende understregning"
-INSTL_DATABASE_TYPE_DESC="Dette er sandsynligvis &quot;mysqli&quot;."
+INSTL_DATABASE_TYPE_DESC="Dette er sandsynligvis "_QQ_"mysqli"_QQ_"."
 INSTL_DATABASE_TYPE_LABEL="Databasetype"
-INSTL_DATABASE_USER_DESC="Enten noget som &quot;root&quot; eller et brugernavn leveret af din host."
+INSTL_DATABASE_USER_DESC="Enten noget som "_QQ_"root"_QQ_" eller et brugernavn leveret af din host."
 INSTL_DATABASE_USER_LABEL="Brugernavn"
-; FTP view
+
+;FTP view
 INSTL_AUTOFIND_FTP_PATH="Find FTP-sti automatisk"
 INSTL_FTP="FTP-konfiguration"
 INSTL_FTP_DESC="<p>På nogle servere kan du være nødt til at angive FTP-oplysninger for at installation kan fuldføres. Hvis du har problemer med at fuldføre installationen uden disse FTP-informationer, tjek da med din host for at afgøre om det er mødvendigt. </p><p>Af sikkerhedsårsager, er det bedst at oprette en særskilt FTP-brugerkonto kun med adgang til Joomla!-installationen og ikke til hele webserveren. Din host kan hjælpe dig med at gøre dette.</p><p><b>Note:</b> Hvis du installerer på et Windows operativsystem, er FTP-laget <strong>ikke</strong> påkrævet.</p>"
@@ -57,7 +61,8 @@ INSTL_VERIFY_FTP_SETTINGS="Bekræft FTP-indstillinger"
 INSTL_FTP_SETTINGS_CORRECT="Indstillinger er korrekte"
 INSTL_FTP_USER_DESC="Advarsel! Det anbefales at lade dette felt være tomt og istedet indtaste dit FTP-brugernavn hver gang du overfører filer."
 INSTL_FTP_PASSWORD_DESC="Advarsel! Det anbefales at lade dette felt være tomt og istedet indtaste din FTP-adgangkode hver gang du overfører filer."
-; Site View
+
+;Site View
 INSTL_SITE="Generel konfiguration"
 INSTL_ADMIN_EMAIL_LABEL="Administrator e-mail"
 INSTL_ADMIN_EMAIL_DESC="Angiv din emailadresse. Dette bliver email adressen for webstedets superbruger."
@@ -86,14 +91,16 @@ INSTL_SAMPLE_BROCHURE_SET_DESC="Installer Joomla med et par sider (en menu med s
 INSTL_SAMPLE_DATA_SET_DESC="Installer Joomla med en side (en menu med et link) og moduler såsom Seneste artikler, log på Formular."
 INSTL_SAMPLE_LEARN_SET_DESC="Installer Joomla med eksempel artikler som beskriver hvordan Joomla fungerer."
 INSTL_SAMPLE_TESTING_SET_DESC="Installer Joomla med alle de mulige menu elementer for at hjælpe med at afprøve Joomla."
-; Summary view
+
+;Summary view
 INSTL_FINALISATION="Afslutning"
 INSTL_SUMMARY_INSTALL="Installer"
 INSTL_SUMMARY_EMAIL_LABEL="Email konfiguration"
 INSTL_SUMMARY_EMAIL_DESC="Vælg om du vil emaile nedenstående konfigurationsindstillinger til %s efter installationen."
 INSTL_SUMMARY_EMAIL_PASSWORDS_LABEL="Inkluder adgangskoder i email"
 INSTL_SUMMARY_EMAIL_PASSWORDS_DESC="Advarsel! Det anbefales ikke at sende og gemme dine adgangskoder i emails."
-; Installing view
+
+;Installing view
 INSTL_INSTALLING="Installerer ..."
 INSTL_INSTALLING_DATABASE_BACKUP="Laver backup af gamle database tabeller"
 INSTL_INSTALLING_DATABASE_REMOVE="Fjerner gamle databasetabeller"
@@ -101,11 +108,13 @@ INSTL_INSTALLING_DATABASE="Opretter databasetabeller"
 INSTL_INSTALLING_SAMPLE="Installerer demodata"
 INSTL_INSTALLING_CONFIG="Opretter konfigurationsfil"
 INSTL_INSTALLING_EMAIL="Sender email til %s"
-; Email
+
+;Email
 INSTL_EMAIL_SUBJECT="Konfigurations detaljer: %s"
 INSTL_EMAIL_HEADING="Nedenfor finder du konfigurationsindstillingerne for et nyligt opsat Joomla! websted:"
 INSTL_EMAIL_NOT_SENT="Email kunne ikke sendes."
-; Complete view
+
+;Complete view
 INSTL_COMPLETE_ADMINISTRATION_LOGIN_DETAILS="Log ind detaljer for administration"
 ; The word 'installation' should not be translated as it is a physical folder.
 INSTL_COMPLETE_ERROR_FOLDER_ALREADY_REMOVED="Mappen installation er allerede blevet fjernet."
@@ -123,7 +132,8 @@ INSTL_COMPLETE_REMOVE_FOLDER="Fjern mappen installation"
 INSTL_COMPLETE_REMOVE_INSTALLATION="HUSK VENLIGST AT FJERNE MAPPEN 'INSTALLATION' FULDSTÆNDIGT<br />Du kan ikke fortsætte før du har fjernet mappen 'installation'. Dette er en sikkerhedsfunktion i Joomla!"
 INSTL_COMPLETE_TITLE="Tillykke! Joomla! er nu installeret."
 INSTL_COMPLETE_INSTALL_LANGUAGES="Ekstra skridt: Installer sprog"
-; Languages view
+
+;Languages view
 INSTL_LANGUAGES="Installer sprogpakker"
 INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE="Sprog"
 INSTL_LANGUAGES_COLUMN_HEADER_VERSION="Version"
@@ -134,7 +144,8 @@ INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="Der er ikke valgt nogen sprog til installa
 INSTL_LANGUAGES_WARNING_NO_INTERNET="Joomla! kunne ikke forbinde til sprogserveren. Færdiggør venligst installationsprocessen."
 INSTL_LANGUAGES_WARNING_NO_INTERNET2="Bemærk: Du kan installere sprog senere, ved at anvende Joomla! administrator"
 INSTL_LANGUAGES_WARNING_BACK_BUTTON="Returner til seneste installations skridt"
-; Default language view
+
+;Default language view
 INSTL_DEFAULTLANGUAGE_ACTIVATE_MULTILANGUAGE="Aktiver multisprog funktionen"
 INSTL_DEFAULTLANGUAGE_ACTIVATE_MULTILANGUAGE_DESC="Hvis aktiv, så vil multisprogsfunktionen være aktiv på dit Joomla websted med lokaliserede menuer for hvert sprog."
 INSTL_DEFAULTLANGUAGE_ACTIVATE_LANGUAGE_CODE_PLUGIN="Aktiver sprogkode programudvidelsen"
@@ -167,13 +178,15 @@ INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT_DESC="Hvis aktiv, så vil Joomla
 INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_TITLE="Multisprog"
 INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_DESC="Denne sektion tillader dig at aktivere Joomla! multisprogsfunktionen automatisk."
 INSTL_DEFAULTLANGUAGE_TRY_LATER="Du kan installere det senere, ved at anvende Joomla administrator."
+
 ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example Spanish will be Español
 INSTL_DEFAULTLANGUAGE_NATIVE_LANGUAGE_NAME="Dansk (DK)"
-; Database Model
+
+;Database Model
 INSTL_DATABASE_COULD_NOT_CONNECT="Kunne ikke tilslutte til databasen. Forbindelsen returnerede fejl/nummer: %s"
 INSTL_DATABASE_COULD_NOT_CREATE_DATABASE="Installationsprocessen kunne ikke forbinde til den angivne database og kunne ikke oprette databasen. Kontroller venligst dine indstillinger og om nødvendigt, opret manuelt din database."
 INSTL_DATABASE_COULD_NOT_REFRESH_MANIFEST_CACHE="Kunne ikke opdatere manifest cache for udvidelsen: %s"
-INSTL_DATABASE_EMPTY_NAME="Du skal angive et databasenavn!"
+INSTL_DATABASE_EMPTY_NAME="http://forum.joomla.org/viewforum.php?f=16"
 INSTL_DATABASE_ERROR_BACKINGUP="Nogle fejl opstod under backup af databasen."
 INSTL_DATABASE_ERROR_CREATE="En fejl opstod under forsøget på at oprette databasen %s.<br />Brugeren har formodentlig ikke rettigheder til at oprette en databse. Den påkrævede database skal oprettes inden installationen af Joomla!"
 INSTL_DATABASE_ERROR_DELETE="Nogle fejl opstod under sletning af databasen"
@@ -189,35 +202,40 @@ INSTL_DATABASE_INVALID_SQLSRV_VERSION="Du behøver SQL Server 2008 R2 (10.50.160
 INSTL_DATABASE_INVALID_SQLZURE_VERSION="Du behøver SQL Server 2008 R2 (10.50.1600.1) eller højere for at fortsætte installationen. Din version er: %s"
 INSTL_DATABASE_INVALID_TYPE="Vælg venligst databasetype"
 INSTL_DATABASE_NAME_TOO_LONG="MySQL databasenavnet må maksimalt være 64 karakterer"
-INSTL_DATABASE_INVALID_NAME="MySQL versioner tidligere end 5.1.6 må ikke indeholde punktum eller andre &quot;specielle&quot; tegn i navnet. Din version er: %s"
+INSTL_DATABASE_INVALID_NAME="MySQL versioner tidligere end 5.1.6 må ikke indeholde punktum eller andre "_QQ_"specielle"_QQ_" tegn i navnet. Din version er: %s"
 INSTL_DATABASE_NAME_INVALID_SPACES="MySQL databasenavne og tabelnavne må ikke begynde med eller slutte med mellemrum."
 INSTL_DATABASE_NAME_INVALID_CHAR="Ingen MySQL identifikator kan indeholde et NULL ASCII(0x00)."
 INSTL_DATABASE_FILE_DOES_NOT_EXIST="Filen %s findes ikke"
-; controllers
+
+;controllers
 INSTL_COOKIES_NOT_ENABLED="Cookies ser ikke ud til at være aktiveret på din klient. Du vil ikke kunne installere applikationen med denne funktion deaktiveret. Alternativt, kan der være et problem med serverens <strong>session.save_path</strong>, hvis dette er årsagen til problemet så kontakt venligst din hostingudbyder hvis du ikke selv ved hvordan du skal kontrollere eller rette dette problem."
 INSTL_HEADER_ERROR="Fejl"
-; Helpers
+
+;Helpers
 INSTL_PAGE_TITLE="Joomla! Web-installation"
-; Configuration model
+
+;Configuration model
 INSTL_ERROR_CONNECT_DB="Kunne ikke tilslutte til databasen. Forbindelsen returnerede fejl/nummer: %s"
 INSTL_STD_OFFLINE_MSG="Dette websted opdateres i øjeblikket.<br />Prøv venligst igen senere."
-; FTP model
+
+;FTP model
 INSTL_FTP_INVALIDROOT="Den angivne FTP-mappe er ikke mappen for denne Joomla! installation"
 INSTL_FTP_NOCONNECT="Kunne ikke forbinde til FTP-serveren"
-INSTL_FTP_NODELE="Funktionen &quot;DELE&quot; fejlede."
+INSTL_FTP_NODELE="Funktionen "_QQ_"DELE"_QQ_" fejlede."
 INSTL_FTP_NODIRECTORYLISTING="Kunne ikke hente en mappe-liste fra FTP-serveren."
-INSTL_FTP_NOLIST="Funktionen &quot;LIST&quot; fejlede."
+INSTL_FTP_NOLIST="Funktionen "_QQ_"LIST"_QQ_" fejlede."
 INSTL_FTP_NOLOGIN="Kunne ikke logge ind på FTP-serveren."
-INSTL_FTP_NOMKD="Funktionen &quot;MKD&quot; fejlede."
-INSTL_FTP_NONLST="Funktionen &quot;NLST&quot; fejlede."
-INSTL_FTP_NOPWD="Funktionen &quot;PWD&quot; fejlede."
-INSTL_FTP_NORETR="Funktionen &quot;RETR&quot; fejlede."
-INSTL_FTP_NORMD="Funktionen &quot;RMD&quot; fejlede."
+INSTL_FTP_NOMKD="Funktionen "_QQ_"MKD"_QQ_" fejlede."
+INSTL_FTP_NONLST="Funktionen "_QQ_"NLST"_QQ_" fejlede."
+INSTL_FTP_NOPWD="Funktionen "_QQ_"PWD"_QQ_" fejlede."
+INSTL_FTP_NORETR="Funktionen "_QQ_"RETR"_QQ_" fejlede."
+INSTL_FTP_NORMD="Funktionen "_QQ_"RMD"_QQ_" fejlede."
 INSTL_FTP_NOROOT="Kunne ikke tilgå den angivne FTP-mappe."
-INSTL_FTP_NOSTOR="Funktionen &quot;STOR&quot; fejlede."
-INSTL_FTP_NOSYST="Funktionen &quot;SYST&quot; fejlede."
+INSTL_FTP_NOSTOR="Funktionen "_QQ_"STOR"_QQ_" fejlede."
+INSTL_FTP_NOSYST="Funktionen "_QQ_"SYST"_QQ_" fejlede."
 INSTL_FTP_UNABLE_DETECT_ROOT_FOLDER="Kunne ikke autodetekte FTP-rodmappen"
-; others
+
+;others
 INSTL_CONFPROBLEM="Din konfigurationsfil eller mappe er ikke skrivbar, eller der opstod et problem med at oprette konfigurationsfilen. Du er nødt til at uploade den følgende kode manuelt. Tryk i tekstfeltet for at markere hele koden, for derefter at kopiere og indsætte den i en ny fil, navngivet:configuration.php. Upload derefter filen til din rodmappe på dit websted."
 INSTL_DATABASE_SUPPORT="Database understøttelse:"
 INSTL_DISPLAY_ERRORS="Fejlvisning"
@@ -245,7 +263,8 @@ INSTL_XML_SUPPORT="XML understøttelse"
 INSTL_ZIP_SUPPORT_AVAILABLE="Nativ ZIP understøttelse (Anbefalet)"
 INSTL_ZLIB_COMPRESSION_SUPPORT="zlib kompressionsunderstøttelse"
 INSTL_PROCESS_BUSY="Processen er i gang. Vent venligst ..."
-; Global strings
+
+;Global strings
 JADMINISTRATOR="Administrator"
 JCHECK_AGAIN="Kontroller igen"
 JERROR="Fejl"
@@ -265,6 +284,7 @@ JPREVIOUS="Forrige"
 JSITE="Websted"
 JUSERNAME="Brugernavn"
 JYES="Ja"
+
 ; Framework strings necessary when no lang pack is available
 JLIB_DATABASE_ERROR_CONNECT_MYSQL="Kunne ikke forbinde til MySQL."
 JLIB_DATABASE_ERROR_DATABASE="En database fejl opstod."
@@ -272,21 +292,24 @@ JLIB_DATABASE_ERROR_LOAD_DATABASE_DRIVER="Kan ikke indlæse Database driver: %s"
 JLIB_ENVIRONMENT_SESSION_EXPIRED="Din session er udløbet, opdater venligst siden."
 JLIB_FILESYSTEM_ERROR_COPY_FAILED="Kopiering fejlede"
 JLIB_FILESYSTEM_ERROR_PATH_IS_NOT_A_FOLDER_FILES="JFolder: :filer: Stien er ikke en mappe: Sti: %s"
-JLIB_FORM_FIELD_INVALID="Ugyldigt felt:&#160\""
+JLIB_FORM_FIELD_INVALID="Ugyldigt felt:&#160\"_QQ_""
 JLIB_FORM_VALIDATE_FIELD_INVALID="Ugyldigt felt: %s"
 JLIB_FORM_VALIDATE_FIELD_REQUIRED="Felt påkrævet: %s"
 JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :Installer: Kunne ikke kopiere filen %1$s til %2$s."
 JLIB_INSTALLER_NOT_ERROR="Hvis fejlen er relateret til installationen af TinyMCE sprogfiler, så har det ingen effekt på installationen af sprog. Nogle sprogpakker, der er oprettet før Joomla! 3.2.0 kan forsøge at installere separate TinyMCE sprogfiler. Da disse nu er inkluderet i kernen behøves de ikke længere at blive installeret."
 JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: Kunne ikke forbinde til database <br />joomla.library: %1$s - %2$s"
+
 ; Strings for the language debugger
 JDEBUG_LANGUAGE_FILES_IN_ERROR="Parser fejl i sprogfiler"
 JDEBUG_LANGUAGE_UNTRANSLATED_STRING="Ikke oversatte strenge"
 JNONE="Ingen"
+
 ; Necessary for errors
 ADMIN_EMAIL="Administrator e-mail"
 ADMIN_PASSWORD="Administrator adgangskode"
 ADMIN_PASSWORD2="Bekræft administrator adgangskode"
 SITE_NAME="Webstedets navn"
+
 ; Database types (allows for a more descriptive label than the internal name)
 MYSQL="MySQL"
 MYSQLI="MySQLi"
@@ -296,3 +319,4 @@ POSTGRESQL="PostgreSQL"
 SQLAZURE="Microsoft SQL Azure"
 SQLITE="SQLite"
 SQLSRV="Microsoft SQL Server"
+
diff --git a/installation/language/da-DK/da-DK.xml b/installation/language/da-DK/da-DK.xml
index 54ad92c3564c3..fbac383da56de 100644
--- a/installation/language/da-DK/da-DK.xml
+++ b/installation/language/da-DK/da-DK.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <metafile
-	version="3.4"
+	version="3.5"
 	client="installation">
 	<name>Danish (DK)</name>
-	<version>3.4.4</version>
+	<version>3.5.0</version>
 	<creationDate>August 2015</creationDate>
 	<author>Danish Translation project</author>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/installation/language/de-DE/de-DE.ini b/installation/language/de-DE/de-DE.ini
index d68ee018fc7c3..7547563ba7463 100644
--- a/installation/language/de-DE/de-DE.ini
+++ b/installation/language/de-DE/de-DE.ini
@@ -89,7 +89,7 @@ INSTL_SAMPLE_LEARN_SET="Englische (GB) Beispieldaten: Joomla! erlernen"
 INSTL_SAMPLE_TESTING_SET="Englische (GB) Beispieldaten: Testinhalte"
 INSTL_SITE_INSTALL_SAMPLE_NONE_DESC="Joomla! mit nur einem Menü, einem Anmeldeformular und ohne weitere Inhalte installieren."
 INSTL_SAMPLE_BLOG_SET_DESC="Joomla! mit ein paar Beiträgen, Blog bezogenen Modulen, wie letzte Beiträge und am häufigsten gelesene Beiträge installieren."
-INSTL_SAMPLE_BROCHURE_SET_DESC="Joomla! mit ein paar Seiten (ein Menü mit: Home, Über uns, News, Kontakt) und Modulen, wie der Suche, eigenes HTML und einem Anmeldeformular installieren."
+INSTL_SAMPLE_BROCHURE_SET_DESC="Joomla! mit ein paar Seiten (ein Menü mit: Home, Über uns, News, Kontakt) und den Modulen: Suche, Benutzerdefiniert und Anmeldeformular installieren."
 INSTL_SAMPLE_DATA_SET_DESC="Joomla! mit nur einer Seite (einem Menü mit nur einem Link) und Modulen, wie letzter Beitrag und dem Anmeldeformular installieren."
 INSTL_SAMPLE_DATA_DE_SET_DESC="Joomla! mit nur einer Seite (einem Menü mit nur einem Link) und Modulen, wie letzter Beitrag und dem Anmeldeformular installieren."
 INSTL_SAMPLE_LEARN_SET_DESC="Joomla! mit Beispielbeiträgen installieren, die beschreiben, wie Joomla! funktioniert."
@@ -120,11 +120,11 @@ INSTL_EMAIL_NOT_SENT="Die E-Mail konnte nicht gesendet werden!"
 ; Complete view
 INSTL_COMPLETE_ADMINISTRATION_LOGIN_DETAILS="Anmeldeinformation für die Administration"
 ; The word 'installation' should not be translated as it is a physical folder.
-INSTL_COMPLETE_ERROR_FOLDER_ALREADY_REMOVED="Das Verzeichnis &bdquo;installation&ldquo; wurde bereits gelöscht."
+INSTL_COMPLETE_ERROR_FOLDER_ALREADY_REMOVED="Das Verzeichnis „installation“ wurde bereits gelöscht."
 ; The word 'installation' should not be translated as it is a physical folder.
-INSTL_COMPLETE_ERROR_FOLDER_DELETE="Das Verzeichnis &bdquo;installation&ldquo; konnte nicht gelöscht werden. Bitte das Verzeichnis manuell löschen."
+INSTL_COMPLETE_ERROR_FOLDER_DELETE="Das Verzeichnis „installation“ konnte nicht gelöscht werden. Bitte das Verzeichnis manuell löschen."
 ; The word 'installation' should not be translated as it is a physical folder.
-INSTL_COMPLETE_FOLDER_REMOVED="Das Verzeichnis &bdquo;installation&ldquo; wurde gelöscht!"
+INSTL_COMPLETE_FOLDER_REMOVED="Das Verzeichnis „installation“ wurde gelöscht!"
 INSTL_COMPLETE_LANGUAGE_1="Joomla! in der eigenen Sprache und/oder eine automatisch standardmäßig eingerichtete multilinguale Webseitenerstellung"
 ; The word 'installation' should not be translated as it is a physical folder.
 INSTL_COMPLETE_LANGUAGE_DESC="Bevor das Installationsverzeichnis gelöscht werden sollte, können noch weitere Sprachen für Joomla! installiert werden. Dazu genügt ein Klick auf den folgenden Button."
diff --git a/installation/language/de-DE/de-DE.xml b/installation/language/de-DE/de-DE.xml
index 8f6686136631f..15e176afba119 100644
--- a/installation/language/de-DE/de-DE.xml
+++ b/installation/language/de-DE/de-DE.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<metafile version="3.4" client="installation">
+<metafile version="3.5" client="installation">
 	<name>German (Germany-Switzerland-Austria)</name>
-	<version>3.4.4</version>
+	<version>3.5.0</version>
 	<creationDate>September 2015</creationDate>
 	<author>J!German</author>
 	<copyright>Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved.</copyright>
diff --git a/installation/language/en-AU/en-AU.ini b/installation/language/en-AU/en-AU.ini
index 2e6e3227668ed..1d912fb220fe1 100644
--- a/installation/language/en-AU/en-AU.ini
+++ b/installation/language/en-AU/en-AU.ini
@@ -89,7 +89,7 @@ INSTL_SAMPLE_LEARN_SET="Learn Joomla English (GB) Sample Data"
 INSTL_SAMPLE_TESTING_SET="Test English (GB) Sample Data"
 INSTL_SITE_INSTALL_SAMPLE_NONE_DESC="Install Joomla with just one menu and a login form, without any content."
 INSTL_SAMPLE_BLOG_SET_DESC="Install Joomla with a few articles and blog related modules like Older Posts, Blog Roll, Most Read Posts."
-INSTL_SAMPLE_BROCHURE_SET_DESC="Install Joomla with a few pages (a menu with pages Home, About Us, News, Contact Us) and modules like Search, Custom HTML, Login Form."
+INSTL_SAMPLE_BROCHURE_SET_DESC="Install Joomla with a few pages (a menu with pages Home, About Us, News, Contact Us) and modules like Search, Custom, Login Form."
 INSTL_SAMPLE_DATA_SET_DESC="Install Joomla with one page (a menu with one link) and modules like Latest Article, Login Form."
 INSTL_SAMPLE_LEARN_SET_DESC="Install Joomla with example articles that describe how Joomla works."
 INSTL_SAMPLE_TESTING_SET_DESC="Install Joomla with all possible menu items to help with testing Joomla."
diff --git a/installation/language/en-AU/en-AU.xml b/installation/language/en-AU/en-AU.xml
index d19c056d05831..9439d74a70a8c 100644
--- a/installation/language/en-AU/en-AU.xml
+++ b/installation/language/en-AU/en-AU.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <metafile
-	version="3.4"
+	version="3.5"
 	client="installation">
 	<name>English (Australia)</name>
-	<version>3.4.6</version>
+	<version>3.5.0</version>
 	<creationDate>September 2012</creationDate>
 	<author>Joomla! Project</author>
 	<copyright>Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved.</copyright>
diff --git a/installation/language/en-CA/en-CA.ini b/installation/language/en-CA/en-CA.ini
index 5fa0a27a697e0..5acf53d24c55c 100644
--- a/installation/language/en-CA/en-CA.ini
+++ b/installation/language/en-CA/en-CA.ini
@@ -89,7 +89,7 @@ INSTL_SAMPLE_LEARN_SET="Learn Joomla English (GB) Sample Data"
 INSTL_SAMPLE_TESTING_SET="Test English (GB) Sample Data"
 INSTL_SITE_INSTALL_SAMPLE_NONE_DESC="Install Joomla with just one menu and a login form, without any content."
 INSTL_SAMPLE_BLOG_SET_DESC="Install Joomla with a few articles and blog related modules like Older Posts, Blog Roll, Most Read Posts."
-INSTL_SAMPLE_BROCHURE_SET_DESC="Install Joomla with a few pages (a menu with pages Home, About Us, News, Contact Us) and modules like Search, Custom HTML, Login Form."
+INSTL_SAMPLE_BROCHURE_SET_DESC="Install Joomla with a few pages (a menu with pages Home, About Us, News, Contact Us) and modules like Search, Custom, Login Form."
 INSTL_SAMPLE_DATA_SET_DESC="Install Joomla with one page (a menu with one link) and modules like Latest Article, Login Form."
 INSTL_SAMPLE_LEARN_SET_DESC="Install Joomla with example articles that describe how Joomla works."
 INSTL_SAMPLE_TESTING_SET_DESC="Install Joomla with all possible menu items to help with testing Joomla."
diff --git a/installation/language/en-CA/en-CA.xml b/installation/language/en-CA/en-CA.xml
index 4ce87b1e64e9a..bfbcc00f227bf 100644
--- a/installation/language/en-CA/en-CA.xml
+++ b/installation/language/en-CA/en-CA.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <metafile
-	version="3.4"
+	version="3.5"
 	client="installation">
 	<name>English (Canada)</name>
-	<version>3.4.6</version>
+	<version>3.5.0</version>
 	<creationDate>2014-04-12</creationDate>
 	<author>Martin Lamothe</author>
 	<copyright>Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved.</copyright>
diff --git a/installation/language/en-GB/en-GB.xml b/installation/language/en-GB/en-GB.xml
index c8be785f55cc3..634da89f5ada4 100644
--- a/installation/language/en-GB/en-GB.xml
+++ b/installation/language/en-GB/en-GB.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <metafile
-	version="3.4"
+	version="3.5"
 	client="installation">
 	<name>English (United Kingdom)</name>
-	<version>3.4.6</version>
+	<version>3.5.0</version>
 	<creationDate>August 2015</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
diff --git a/installation/language/en-US/en-US.ini b/installation/language/en-US/en-US.ini
index 2475fe7620eca..8bf16456f218b 100644
--- a/installation/language/en-US/en-US.ini
+++ b/installation/language/en-US/en-US.ini
@@ -89,7 +89,7 @@ INSTL_SAMPLE_LEARN_SET="Learn Joomla English (GB) Sample Data"
 INSTL_SAMPLE_TESTING_SET="Test English (GB) Sample Data"
 INSTL_SITE_INSTALL_SAMPLE_NONE_DESC="Install Joomla with just one menu and a login form, without any content."
 INSTL_SAMPLE_BLOG_SET_DESC="Install Joomla with a few articles and blog related modules like Older Posts, Blog Roll, Most Read Posts."
-INSTL_SAMPLE_BROCHURE_SET_DESC="Install Joomla with a few pages (a menu with pages Home, About Us, News, Contact Us) and modules like Search, Custom HTML, Login Form."
+INSTL_SAMPLE_BROCHURE_SET_DESC="Install Joomla with a few pages (a menu with pages Home, About Us, News, Contact Us) and modules like Search, Custom, Login Form."
 INSTL_SAMPLE_DATA_SET_DESC="Install Joomla with one page (a menu with one link) and modules like Latest Article, Login Form."
 INSTL_SAMPLE_LEARN_SET_DESC="Install Joomla with example articles that describe how Joomla works."
 INSTL_SAMPLE_TESTING_SET_DESC="Install Joomla with all possible menu items to help with testing Joomla."
diff --git a/installation/language/en-US/en-US.xml b/installation/language/en-US/en-US.xml
index 6651c8435e193..17362c598d40c 100644
--- a/installation/language/en-US/en-US.xml
+++ b/installation/language/en-US/en-US.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<metafile version="3.4"
+<metafile version="3.5"
 	client="installation">
 	<name>US English - en-US</name>
-	<version>3.4.6</version>
+	<version>3.5.0</version>
 	<creationDate>September 2012</creationDate>
 	<author>US Translation Team</author>
 	<copyright>Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved.</copyright>
diff --git a/installation/language/fa-IR/fa-IR.ini b/installation/language/fa-IR/fa-IR.ini
index 2cf6fe1f19f15..3aa75feecfba0 100644
--- a/installation/language/fa-IR/fa-IR.ini
+++ b/installation/language/fa-IR/fa-IR.ini
@@ -49,7 +49,7 @@ INSTL_DATABASE_USER_LABEL="نام کاربری"
 ;FTP view
 INSTL_AUTOFIND_FTP_PATH="یافتن خودکار مسیر FTP"
 INSTL_FTP="تنظیمات FTP"
-INSTL_FTP_DESC="<p>این بخش مربوط به تنظیمات لایه FTP می باشد.لایه FTP به لایه ای که امکان انتقال فایل ها از سمت کاربر به سمت سرور را می دهد.اگر این تنظیمات این بخش را بدرستی وارد و تایید کرده باشید ، در نصب افزونه ها (امکانات اضافی ) به مشکل بر نمی خورید. همچنین از نظر امنیتی با تنظیم این لایه ، امنیت بیشتری بدست خواهید آورد. در صورتی که تمایل به مطالعه بیشتر و نحوه فعال سازی این بخش دارید ، می توانید لایه FTP را در گوگل جستجو کنید.</p><p><b>توجه:</b> اگر شما در حال نصب جوملا بر روی لوکال هاست یا ویندوز هستید ، نیاز نیست این بخش را فعال کنید.</p>"
+INSTL_FTP_DESC="<p>این بخش مربوط به تنظیمات لایه FTP می باشد.لایه FTP به لایه ای که امکان انتقال فایل ها از سمت کاربر به سمت سرور را می دهد.اگر این تنظیمات این بخش را بدرستی وارد و تایید کرده باشید، در نصب افزونه ها (امکانات اضافی ) به مشکل بر نمی خورید. همچنین از نظر امنیتی با تنظیم این لایه، امنیت بیشتری بدست خواهید آورد. در صورتی که تمایل به مطالعه بیشتر و نحوه فعال سازی این بخش دارید، می توانید لایه FTP را در گوگل جستجو کنید.</p><p><b>توجه:</b> اگر شما در حال نصب جوملا بر روی لوکال هاست یا ویندوز هستید، نیاز نیست این بخش را فعال کنید.</p>"
 INSTL_FTP_ENABLE_LABEL="فعال سازی لایه FTP"
 INSTL_FTP_HOST_LABEL="هاست FTP"
 INSTL_FTP_PASSWORD_LABEL="رمز عبور FTP"
@@ -67,7 +67,7 @@ INSTL_VERIFY_FTP_SETTINGS="تایید تنظیمات FTP"
 INSTL_SITE="تنظیمات اصلی "
 INSTL_SITE_NAME_LABEL="نام سایت"
 INSTL_ADMIN_EMAIL_LABEL="ایمیل مدیر ارشد"
-INSTL_ADMIN_EMAIL_DESC="آدرس ایمیل خود را وارد نمایید ، این ایمیل به عنوان ایمیل مدیر می باشد."
+INSTL_ADMIN_EMAIL_DESC="آدرس ایمیل خود را وارد نمایید، این ایمیل به عنوان ایمیل مدیر می باشد."
 INSTL_ADMIN_PASSWORD_LABEL="رمز عبور مدیر ارشد"
 INSTL_ADMIN_PASSWORD_DESC="رمز عبور مدیر را وارد نمایید."
 INSTL_ADMIN_PASSWORD2_LABEL="تکرار رمز عبور مدیر ارشد"
@@ -85,9 +85,9 @@ INSTL_SITE_INSTALL_SAMPLE_NONE_DESC="جوملا را با یک منو و فرم
 INSTL_SAMPLE_BLOG_SET="وبلاگ فارسی (IR)"
 INSTL_SAMPLE_BLOG_SET_DESC="جوملا را با چند مطلب و ماژول های مرتبط به وبلاگ مانند پست های قدیم تر، نظرسنجی، و مطالب بیشتری نصب می کند."
 INSTL_SAMPLE_BROCHURE_SET="بورشور فارسی (IR)"
-INSTL_SAMPLE_BROCHURE_SET_DESC="جوملا را با چند صفحه (منو با صفحه اصلی ، درباره ما ، اخبار ، تماس با ما) و ماژول های  جستجو، HTML سفارشی ، فرم ورود ، نصب می کند."
+INSTL_SAMPLE_BROCHURE_SET_DESC="جوملا را با چند صفحه (منو با صفحه اصلی، درباره ما، اخبار، تماس با ما) و ماژول های  جستجو، سفارشی، فرم ورود، نصب می کند."
 INSTL_SAMPLE_DATA_SET="اطلاعات نمونه پیش فرض فارسی (IR)"
-INSTL_SAMPLE_DATA_SET_DESC="جوملا را با یک صفحه (یک منو با یک لینک) و ماژول ها مانند آخرین مطالب ، فرم ورود نصب می کند."
+INSTL_SAMPLE_DATA_SET_DESC="جوملا را با یک صفحه (یک منو با یک لینک) و ماژول ها مانند آخرین مطالب، فرم ورود نصب می کند."
 INSTL_SAMPLE_LEARN_SET="اطلاعات نمونه آموزش جوملا فارسی (IR)"
 INSTL_SAMPLE_LEARN_SET_DESC="نصب جوملا را با مطالب نمونه نشان می دهد که چگونه جوملا کار می کند."
 INSTL_SAMPLE_TESTING_SET="اطلاعات نمونه آزمایشی فارسی (IR)"
@@ -253,7 +253,7 @@ INSTL_MB_LANGUAGE_IS_DEFAULT="زبان اصلی موجود می باشد"
 INSTL_MB_STRING_OVERLOAD_OFF="میزان سر ریزی رشته با حسب مگابایت خاموش است"
 INSTL_NOTICEMBLANGNOTDEFAULT="زبان متغییر MB پی اچ پی نظیم نشده است . این می تواند به صورت محلی با وارد کردن <strong>php_value متغییر MB تنظیم شود.زبان خنثی</strong> <code>.htaccess</code> در فایل."
 INSTL_NOTICEMBSTRINGOVERLOAD="تابع متغییر MBپی اچ پی اضافی تنظیم شده است. این می تواند بطور محلی خاموش شود با وارد کردن <strong>php_value mbstring.func_overload 0</strong> <code>.htaccess</code>در فایل  ."
-INSTL_NOTICEYOUCANSTILLINSTALL="<br />شما هنوز می توانید نصب را ادامه دهید بطوریکه تنظیمات پیکربندی در پایان نمایش داده خواهد شد. شما بایستی بصورت دستی کد های داده شده در مرحله نهایی را آپلود کنید. شما بایستی یک فایل configuration.php در انتهای مرحله نصب ایجاد کرده و کد هایی که در انتهای نصب به شما داده می شود را درون آن قرار داده و سپس در پوشه ای که جوملا در آن نصب است ، آپلود کنید."
+INSTL_NOTICEYOUCANSTILLINSTALL="<br />شما هنوز می توانید نصب را ادامه دهید بطوریکه تنظیمات پیکربندی در پایان نمایش داده خواهد شد. شما بایستی بصورت دستی کد های داده شده در مرحله نهایی را آپلود کنید. شما بایستی یک فایل configuration.php در انتهای مرحله نصب ایجاد کرده و کد هایی که در انتهای نصب به شما داده می شود را درون آن قرار داده و سپس در پوشه ای که جوملا در آن نصب است، آپلود کنید."
 INSTL_OUTPUT_BUFFERING="میانگیری خروجی"
 INSTL_PARSE_INI_FILE_AVAILABLE="پشتیبانی از فشرده سازی"
 INSTL_PHP_VERSION="نسخه php"
diff --git a/installation/language/fa-IR/fa-IR.xml b/installation/language/fa-IR/fa-IR.xml
index 7d8c0a14e76c4..27151a4386883 100644
--- a/installation/language/fa-IR/fa-IR.xml
+++ b/installation/language/fa-IR/fa-IR.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <metafile
-	version="3.4"
+	version="3.5"
 	client="installation">
 	<name>Persian (پارسی)</name>
-	<version>3.4.4</version>
+	<version>3.5.0</version>
 	<creationDate>2012-09-24</creationDate>
 	<author>Joomla Farsi Team</author>
 	<copyright>Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved.</copyright>
diff --git a/installation/language/ga-IE/ga-IE.ini b/installation/language/ga-IE/ga-IE.ini
new file mode 100644
index 0000000000000..b1fa89213f914
--- /dev/null
+++ b/installation/language/ga-IE/ga-IE.ini
@@ -0,0 +1,321 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt
+; Note : All ini files need to be saved as UTF-8
+
+;Stepbar
+INSTL_STEP_COMPLETE_LABEL="Críochnaigh"
+INSTL_STEP_DATABASE_LABEL="Bunachar Sonraí"
+INSTL_STEP_DEFAULTLANGUAGE_LABEL="Roghnaigh Teanga Réamhshocraithe"
+INSTL_STEP_FTP_LABEL="FTP"
+INSTL_STEP_LANGUAGES_LABEL="Suiteáil Teangacha"
+INSTL_STEP_SITE_LABEL="Cumraíocht"
+INSTL_STEP_SUMMARY_LABEL="Foramharc"
+
+;Language view
+INSTL_SELECT_LANGUAGE_TITLE="Roghnaigh Teanga"
+INSTL_WARNJAVASCRIPT="Rabhadh! Ní mór duit JavaScript a chumasú chun Joomla! a shuiteáil"
+INSTL_WARNJSON="Ní mór duit JSON a chumasú i do shuiteáil PHP chun Joomla! a shuiteáil"
+
+;Preinstall view
+INSTL_PRECHECK_TITLE="Deimhniú Réamhshuiteála"
+INSTL_PRECHECK_DESC="Má tá aon cheann de na gnéithe seo ar iarraidh (marcáilte <strong class="_QQ_"label label-important"_QQ_">Níl</strong>), ní mór duit iad a shuiteáil i dtosach báire.<br />Ní bheidh tú in ann Joomla! a shuiteáil go dtí go mbeidh na riachtanais go léir ar do chóras."
+INSTL_PRECHECK_RECOMMENDED_SETTINGS_TITLE="Socruithe molta:"
+INSTL_PRECHECK_RECOMMENDED_SETTINGS_DESC="Moltar na socruithe PHP seo sa chaoi go mbeidh sé go hiomlán comhoiriúnach le Joomla.<br />É sin ráite, feidhmeoidh Joomla! fiú mura bhfuil an chumraíocht go hiomlán mar a mholtar."
+INSTL_PRECHECK_DIRECTIVE="Treo"
+INSTL_PRECHECK_RECOMMENDED="Molta"
+INSTL_PRECHECK_ACTUAL="Séard atá ann"
+
+; Database view
+INSTL_DATABASE="Cumraíocht Bhunachair Sonraí"
+INSTL_DATABASE_HOST_DESC="&quot;localhost&quot;, de ghnáth."
+INSTL_DATABASE_HOST_LABEL="Óstainm"
+INSTL_DATABASE_NAME_DESC="Ní cheadaíonn roinnt óstach agus bunachar sonraí amháin ar gach suíomh. Sa chás seo, is féidir réimír thábla a úsáid le haghaidh suíomhanna éagsúla Joomla!."
+INSTL_DATABASE_NAME_LABEL="Ainm an Bhunachair Sonraí"
+INSTL_DATABASE_NO_SCHEMA="Níl aon scéimre bunachair sonraí le haghaidh an chineáil seo bunachair sonraí."
+INSTL_DATABASE_OLD_PROCESS_DESC="Forscríobhfar aon táblaí cúltaca atá ann ó sheanleaganacha Joomla!."
+INSTL_DATABASE_OLD_PROCESS_LABEL="Seanphróiseas an Bhunachair Sonraí"
+INSTL_DATABASE_PASSWORD_DESC="Chun an suíomh a chosaint, caithfidh tú focal faire a úsáid do chuntas an bhunachair sonraí."
+INSTL_DATABASE_PASSWORD_LABEL="Focal faire"
+INSTL_DATABASE_PREFIX_DESC="Roghnaigh réimír thábla nó úsáid <b>réimír randamach</b>. An rud is fearr ná réimír trí nó ceithre charactar, carachtair alfa-uimhriúla amháin, agus caithfear fostríoc a bheith ag an deireadh. <b>Deimhnigh nach bhfuil an réimír in úsáid ag aon tábla eile</b>."
+INSTL_DATABASE_PREFIX_LABEL="Réimír Thábla"
+INSTL_DATABASE_PREFIX_MSG="Ní mór litir a bheith ag tús na réimíre, ansin carachtair (roghnacha) alfa-uimhriúla, agus fostríoc ag an deireadh"
+INSTL_DATABASE_TYPE_DESC="&quot;MySQLi&quot; is dócha."
+INSTL_DATABASE_TYPE_LABEL="Cineál an Bhunachair Sonraí"
+INSTL_DATABASE_USER_DESC="Is éard atá ann ná &quot;root&quot; nó ainm úsáideora ón óstach."
+INSTL_DATABASE_USER_LABEL="Ainm Úsáideora"
+
+;FTP view
+INSTL_AUTOFIND_FTP_PATH="Aimsigh an Cosán FTP go huathoibríoch"
+INSTL_FTP="Cumraíocht FTP"
+INSTL_FTP_DESC="<p>On some servers you may need to provide FTP credentials for installation to complete. If you have difficulties completing installation without these credentials, check with your host to determine if this is necessary. </p><p>For security reasons, it is best to create a separate FTP user account with access to the Joomla! installation only and not the entire web server. Your host can assist you with this.</p><p><b>Note:</b> If you are installing on a Windows Operating System, the FTP layer is <strong>not</strong> required.</p>"
+INSTL_FTP_ENABLE_LABEL="Cumasaigh an tSraith FTP"
+INSTL_FTP_HOST_LABEL="Óstríomhaire FTP"
+INSTL_FTP_PASSWORD_LABEL="Focal faire FTP"
+INSTL_FTP_PORT_LABEL="Port FTP"
+INSTL_FTP_ROOT_LABEL="Fréamhfhillteán FTP"
+INSTL_FTP_SAVE_LABEL="Sábháil an focal faire FTP"
+INSTL_FTP_TITLE="Cumraíocht FTP (<strong class="_QQ_"red"_QQ_">Roghnach - Is dócha nach gá duit bacadh leis an gcéim seo - brúigh Ar Aghaidh más mian leat</strong>)"
+INSTL_FTP_USER_LABEL="Ainm Úsáideora FTP"
+INSTL_VERIFY_FTP_SETTINGS="Deimhnigh na Socruithe FTP"
+INSTL_FTP_SETTINGS_CORRECT="Tá mé sásta leis na socruithe"
+INSTL_FTP_USER_DESC="Rabhadh! Moltar duit an réimse seo a fhágáil folamh agus d'ainm úsáideora FTP a sholáthar gach uair a n-aistríonn tú comhaid."
+INSTL_FTP_PASSWORD_DESC="Rabhadh! Moltar duit an réimse seo a fhágáil folamh agus d'fhocal faire FTP a sholáthar gach uair a n-aistríonn tú comhaid."
+
+;Site View
+INSTL_SITE="Príomhchumraíocht"
+INSTL_ADMIN_EMAIL_LABEL="Seoladh R-Phoist an Riarthóra"
+INSTL_ADMIN_EMAIL_DESC="Cuir isteach seoladh ríomhphoist. Is é seo an seoladh ríomhphoist atá ag Forúsáideoir an tSuímh."
+INSTL_ADMIN_PASSWORD_LABEL="Focal Faire an Riarthóra"
+INSTL_ADMIN_PASSWORD_DESC="Tabhair focal faire an Fhorúsáideora, agus deimhnigh sa réimse thíos é."
+INSTL_ADMIN_PASSWORD2_LABEL="Dearbhaigh Focal Faire an Riarthóra"
+INSTL_ADMIN_USER_LABEL="Ainm Úsáideora an Riarthóra"
+INSTL_ADMIN_USER_DESC="Tabhair ainm chuntas an Fhorúsáideora."
+INSTL_SITE_NAME_LABEL="Ainm an tSuímh"
+INSTL_SITE_NAME_DESC="Cuir isteach ainm do shuímh Jooma!."
+INSTL_SITE_METADESC_LABEL="Cur Síos"
+INSTL_SITE_METADESC_TITLE_LABEL="Déan cur síos ar an suíomh iomlán a mbainfear innill chuardaigh úsáid as. An rud is fearr ná cur síos gairid, níos lú ná 20 focal."
+INSTL_SITE_OFFLINE_LABEL="Suíomh As Líne"
+INSTL_SITE_OFFLINE_TITLE_LABEL="Nuair a bheidh an tsuiteáil críochnaithe, cuir Comhéadan an tsuímh as líne. Is féidir an suíomh a chur ar líne ar ball tríd an gCumraíocht Dhomhanda."
+INSTL_SITE_INSTALL_SAMPLE_LABEL="Suiteáil Sonraí Samplacha"
+INSTL_SITE_INSTALL_SAMPLE_DESC="Moltar go láidir sonraí samplacha a shuiteáil, go háirithe do thosaitheoirí.<br />Suiteálfar ábhar samplach atá ar fáil mar chuid den phacáiste suiteála Joomla!."
+INSTL_SITE_INSTALL_SAMPLE_NONE="Dada (<strong>Riachtanach le bunsuíomh ilteangach a chruthú</strong>)"
+INSTL_SAMPLE_BLOG_SET="Blag - Sonraí Samplacha Béarla (RA)"
+INSTL_SAMPLE_BROCHURE_SET="Leabhrán - Sonraí Samplacha Béarla (RA)"
+INSTL_SAMPLE_DATA_SET="Réamhshocrú - Sonraí Samplacha Béarla (RA)"
+INSTL_SAMPLE_LEARN_SET="Foghlaim Joomla - Sonraí Samplacha Béarla (RA)"
+INSTL_SAMPLE_TESTING_SET="Tástáil - Sonraí Samplacha Béarla (RA)"
+INSTL_SITE_INSTALL_SAMPLE_NONE_DESC="Suiteáil Joomla le roghchlár amháin agus foirm logála isteach, gan ábhar ar bith."
+INSTL_SAMPLE_BLOG_SET_DESC="Suiteáil Joomla le roinnt altanna agus modúil a bhaineann leis an mblagadóireacht: Postálacha Níos Sine, Blagrolla, Postálacha Is Mó Tóir Orthu"
+INSTL_SAMPLE_BROCHURE_SET_DESC="Suiteáil Joomla le roinnt leathanach (roghchlár le leathanaigh Baile, Fúinn, Nuacht, Teagmháil) agus modúil Cuardach, Saincheaptha, Foirm Logála Isteach."
+INSTL_SAMPLE_DATA_SET_DESC="Suiteáil Joomla le leathanach amháin (roghchlár le nasc amháin) agus modúil Alt Is Déanaí, Foirm Logála Isteach."
+INSTL_SAMPLE_LEARN_SET_DESC="Suiteáil Joomla le haltanna samplacha a dhéanann cur síos ar Joomla."
+INSTL_SAMPLE_TESTING_SET_DESC="Suiteáil Joomla le gach ar féidir de mhíreanna, chun tástáil a dhéanamh ar Joomla."
+
+;Summary view
+INSTL_FINALISATION="Dlaoi Mullaigh"
+INSTL_SUMMARY_INSTALL="Suiteáil"
+INSTL_SUMMARY_EMAIL_LABEL="Cumraíocht Ríomhphoist"
+INSTL_SUMMARY_EMAIL_DESC="Seol an chumraíocht chuig %s tar éis suiteála."
+INSTL_SUMMARY_EMAIL_PASSWORDS_LABEL="Cuir Focail Fhaire sa Ríomhphost"
+INSTL_SUMMARY_EMAIL_PASSWORDS_DESC="Rabhadh! Moltar duit gan focail fhaire a sheoladh ná a shábháil i ríomhphost."
+
+;Installing view
+INSTL_INSTALLING="Á Shuiteáil..."
+INSTL_INSTALLING_DATABASE_BACKUP="Cúltaca de sheantáblaí bunachair sonraí á dhéanamh"
+INSTL_INSTALLING_DATABASE_REMOVE="Seantáblaí bunachair sonraí á scriosadh"
+INSTL_INSTALLING_DATABASE="Táblaí bunachair sonraí á gcruthú"
+INSTL_INSTALLING_SAMPLE="Sonraí samplacha á suiteáil"
+INSTL_INSTALLING_CONFIG="Comhad cumraíochta á chruthú"
+INSTL_INSTALLING_EMAIL="Ríomhphost á sheoladh chuig %s"
+
+;Email
+INSTL_EMAIL_SUBJECT="Mionsonraí na Cumraíochta: %s"
+INSTL_EMAIL_HEADING="Anseo gheobhaidh tú an chumraíocht ar shuíomh nua Joomla!:"
+INSTL_EMAIL_NOT_SENT="Níorbh fhéidir an ríomhphost a sheoladh."
+
+;Complete view
+INSTL_COMPLETE_ADMINISTRATION_LOGIN_DETAILS="Sonraí Logála Isteach an Riarthóra"
+; The word 'installation' should not be translated as it is a physical folder.
+INSTL_COMPLETE_ERROR_FOLDER_ALREADY_REMOVED="Scriosadh an fillteán installation cheana."
+; The word 'installation' should not be translated as it is a physical folder.
+INSTL_COMPLETE_ERROR_FOLDER_DELETE="Níorbh fhéidir an fillteán installation a scriosadh. Ba chóir duit é a scriosadh de láimh."
+; The word 'installation' should not be translated as it is a physical folder.
+INSTL_COMPLETE_FOLDER_REMOVED="Scriosadh an fillteán installation."
+INSTL_COMPLETE_LANGUAGE_1="Joomla! i do theanga féin, agus/nó bunsuíomh ilteangach a chruthú go huathoibríoch"
+; The word 'installation' should not be translated as it is a physical folder.
+INSTL_COMPLETE_LANGUAGE_DESC="Sula scriofaidh tú an fillteán installation, is féidir teangacha eile a shuiteáil. Más mian leat teangacha sa bhreis a chur le d'fheidhmchlár Joomla!, cliceáil an cnaipe seo a leanas."
+INSTL_COMPLETE_LANGUAGE_DESC2="Nóta: ní mór duit a bheidh ceangailte leis an Idirlíon sa chaoi go mbeidh Joomla! in ann na teangacha nua a íoslódáil agus a shuiteáil. <br />Ní bheidh tú in ann na teangacha a shuiteáil le cumraíochtaí áirithe. Má tá fadhb agat, ná buair do cheann, beidh tú in ann iad a shuiteáil ar ball trí Riarthóir Joomla!."
+; The word 'installation' should not be translated as it is a physical folder.
+INSTL_COMPLETE_REMOVE_FOLDER="Scrios an fillteán installation"
+; The word 'installation' should not be translated as it is a physical folder.
+INSTL_COMPLETE_REMOVE_INSTALLATION="NÁ DEARMAD AN FILLTEÁN INSTALLATION A SCRIOSADH GO hIOMLÁN.<br />Ní bheidh tú in ann dul ar aghaidh go dtí go mbeidh an fillteán installation scriosta. Is gné slándála de chuid Joomla! é seo"
+INSTL_COMPLETE_TITLE="Comhghairdeas! Tá Joomla! suiteáilte anois."
+INSTL_COMPLETE_INSTALL_LANGUAGES="Céimeanna eile: Suiteáil teangacha"
+
+;Languages view
+INSTL_LANGUAGES="Suiteáil pacáistí teanga"
+INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE="Teanga"
+INSTL_LANGUAGES_COLUMN_HEADER_VERSION="Leagan"
+INSTL_LANGUAGES_DESC="Tá comhéadan Joomla ar fáil i roinnt teangacha éagsúla. Cuir ticeanna sna boscaí in aice le do rogha teangacha, ansin suiteáil iad tríd an cnaipe 'Ar Aghaidh' a chliceáil.<br />Nóta: tógfaidh sé timpeall is 10 soicind chun na teangacha go léir a íoslódáil agus a shuiteáil. Sa chaoi nach rachaidh sé thar am, ná roghnaigh níos mó ná trí theanga le suiteáil."
+INSTL_LANGUAGES_MESSAGE_PLEASE_WAIT="Tógfaidh sé suas le 10 soicind chun gach teanga a chur i gcrích<br />Fan nóiméad go dtí go mbeidh na teangacha íoslódáilte agus suiteáilte..."
+INSTL_LANGUAGES_MORE_LANGUAGES="Brúigh an cnaipe 'Roimhe Seo' más mian leat tuilleadh teangacha a shuiteáil."
+INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="Níor roghnaigh tú aon teanga le suiteáil. Más mian leat níos mó teangacha a shuiteáil, brúigh an cnaipe 'Roimhe Seo' agus roghnaigh na teangacha ón liosta."
+INSTL_LANGUAGES_WARNING_NO_INTERNET="Ní raibh Joomla! in ann ceangal a bhunú le freastalaí na dteangacha. Cuir an tsuiteáil i gcrích anois."
+INSTL_LANGUAGES_WARNING_NO_INTERNET2="Beidh tú in ann teangacha a shuiteáil ar ball trí Riarthóir Joomla!"
+INSTL_LANGUAGES_WARNING_BACK_BUTTON="Fill ar an gcéim shuiteála roimhe seo"
+
+;Default language view
+INSTL_DEFAULTLANGUAGE_ACTIVATE_MULTILANGUAGE="Cuir ilteangachas i ngníomh"
+INSTL_DEFAULTLANGUAGE_ACTIVATE_MULTILANGUAGE_DESC="Leis an rogha seo, beidh do shuíomh Joomla ilteangach, le roghchláir ar fáil i ngach teanga atá suiteáilte."
+INSTL_DEFAULTLANGUAGE_ACTIVATE_LANGUAGE_CODE_PLUGIN="Cumasaigh an breiseán cóid teanga"
+INSTL_DEFAULTLANGUAGE_ACTIVATE_LANGUAGE_CODE_PLUGIN_DESC="Leis an rogha seo, athrófar an cód teanga san HTML chun SEO a fheabhsú."
+INSTL_DEFAULTLANGUAGE_ADMINISTRATOR="Teanga Réamhshocraithe an Riarthóra"
+INSTL_DEFAULTLANGUAGE_ADMIN_COULDNT_SET_DEFAULT="Níorbh fhéidir le Joomla an teanga a úsáid mar réamhshocrú. Is é Béarla an teanga réamhshocraithe don Riarthóir."
+INSTL_DEFAULTLANGUAGE_ADMIN_SET_DEFAULT="Shocraigh Joomla %s mar an teanga réamhshocraithe RIARACHÁIN."
+INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_SELECT="Roghnaigh"
+INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_LANGUAGE="Teanga"
+INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_TAG="Clib"
+INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_CONTENT_LANGUAGE="Níorbh fhéidir le Joomla an teanga ábhair %s a chruthú go huathoibríoch"
+INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_MENU="Níorbh fhéidir le Joomla an roghchlár %s a chruthú go huathoibríoch"
+INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_MENU_ITEM="Níorbh fhéidir le Joomla an mhír %s sa roghchlár baile a chruthú go huathoibríoch"
+INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_MENU_MODULE="Níorbh fhéidir le Joomla an modúl roghchláir %s a chruthú go huathoibríoch"
+INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_CATEGORY="Níorbh fhéidir le Joomla an chatagóir ábhair %s a chruthú go huathoibríoch"
+INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_ARTICLE="Níorbh fhéidir le Joomla an t-alt logánaithe %s a chruthú go huathoibríoch"
+INSTL_DEFAULTLANGUAGE_COULD_NOT_ENABLE_MODULESWHITCHER_LANGUAGECODE="Níorbh fhéidir le Joomla an roghnóir teanga %s a chruthú go huathoibríoch"
+INSTL_DEFAULTLANGUAGE_COULD_NOT_ENABLE_PLG_LANGUAGECODE="Níorbh fhéidir le Joomla an Breiseán Cóid Teanga %s a chruthú go huathoibríoch"
+INSTL_DEFAULTLANGUAGE_COULD_NOT_ENABLE_PLG_LANGUAGEFILTER="Níorbh fhéidir le Joomla an Breiseán Scagaire Teanga %s a chruthú go huathoibríoch"
+INSTL_DEFAULTLANGUAGE_COULD_NOT_INSTALL_LANGUAGE="Níorbh fhéidir le Joomla teanga %s a shuiteáil."
+INSTL_DEFAULTLANGUAGE_COULD_NOT_PUBLISH_MOD_MULTILANGSTATUS="Níorbh fhéidir le Joomla an modúl stádais teanga a fhoilsiú go huathoibríoch"
+INSTL_DEFAULTLANGUAGE_COULD_NOT_UNPUBLISH_MOD_DEFAULTMENU="Níorbh fhéidir le Joomla an modúl roghchláir réamhshocraithe a dhífhoilsiú go huathoibríoch"
+INSTL_DEFAULTLANGUAGE_DESC="Shuiteáil Joomla na teangacha seo a leanas. Roghnaigh teanga réamhshocraithe don Riarthóir Joomla."
+INSTL_DEFAULTLANGUAGE_DESC_FRONTEND="Shuiteáil Joomla na teangacha seo a leanas. Roghnaigh teanga réamhshocraithe don Chomhéadan Joomla."
+INSTL_DEFAULTLANGUAGE_FRONTEND="Teanga Réamhshocraithe an tSuímh"
+INSTL_DEFAULTLANGUAGE_FRONTEND_COULDNT_SET_DEFAULT="Níorbh fhéidir le Joomla an teanga a úsáid mar réamhshocrú. Is é Béarla an teanga réamhshocraithe don SUÍOMH."
+INSTL_DEFAULTLANGUAGE_FRONTEND_SET_DEFAULT="Shocraigh Joomla %s mar an teanga réamhshocraithe don SUÍOMH."
+INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT="Suiteáil ábhar logánaithe"
+INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT_DESC="Leis an rogha seo, cruthóidh Joomla catagóir ábhair amháin go huathoibríoch le haghaidh gach teanga atá suiteáilte. Agus cruthóidh sé gné-alt amháin ina mbeidh ábhar bréige i ngach catagóir."
+INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_TITLE="Ilteangach"
+INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_DESC="Sa rannán seo, is féidir leagan ilteangacha de Joomla! a chumasú go huathoibríoch."
+INSTL_DEFAULTLANGUAGE_TRY_LATER="Beidh tú in ann é a shuiteáil ar ball trí Riarthóir Joomla!"
+
+; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example Spanish will be Español
+INSTL_DEFAULTLANGUAGE_NATIVE_LANGUAGE_NAME="Gaeilge"
+
+;Database Model
+INSTL_DATABASE_COULD_NOT_CONNECT="Ní fhéadfaí ceangal leis an mbunachar sonraí. Fuarthas an cód %s"
+INSTL_DATABASE_COULD_NOT_CREATE_DATABASE="Níorbh fhéidir leis an suiteálaí ceangal leis an mbunachar sonraí ná an bunachar sonraí a chruthú. Deimhnigh na socruithe agus cruthaigh an bunachar sonraí de láimh más gá."
+INSTL_DATABASE_COULD_NOT_REFRESH_MANIFEST_CACHE="Níorbh fhéidir taisce lastliosta na heisínteachta a athnuachan: %s"
+INSTL_DATABASE_EMPTY_NAME=""
+INSTL_DATABASE_ERROR_BACKINGUP="Tharla earráidí agus cúltaca á dhéanamh."
+INSTL_DATABASE_ERROR_CREATE="Tharla earráid agus bunachar sonraí %s á chruthú.<br />Seans nach bhfuil cead ag an úsáideoir bunachar sonraí a chruthú. Sa chás sin, caithfidh tú an bunachar sonraí a chruthú ar dtús sula mbeidh tú in ann Joomla! a shuiteáil."
+INSTL_DATABASE_ERROR_DELETE="Tharla earráidí agus an bunachar sonraí á scriosadh."
+INSTL_DATABASE_FIELD_VALUE_REMOVE="Bain"
+INSTL_DATABASE_FIELD_VALUE_BACKUP="Cúltaca"
+INSTL_DATABASE_FIX_TOO_LONG="Ní cheadaítear níos mó ná 15 carachtar sa réimír thábla MySQL."
+INSTL_DATABASE_INVALID_DB_DETAILS="Tá mionsonraí an bhunachair sonraí mícheart nó folamh."
+INSTL_DATABASE_INVALID_MYSQL_VERSION="Teastaíonn MySQL 5.0.4 nó níos airde uait chun dul ar aghaidh leis an tsuiteáil. An leagan atá agat faoi láthair: %s"
+INSTL_DATABASE_INVALID_MYSQLI_VERSION="Teastaíonn MySQL 5.0.4 nó níos airde uait chun dul ar aghaidh leis an tsuiteáil. An leagan atá agat faoi láthair: %s"
+INSTL_DATABASE_INVALID_PDOMYSQL_VERSION="Teastaíonn MySQL 5.0.4 nó níos airde uait chun dul ar aghaidh leis an tsuiteáil. An leagan atá agat faoi láthair: %s"
+INSTL_DATABASE_INVALID_POSTGRESQL_VERSION="Teastaíonn PostgreSQL 8.3.18 nó níos airde uait chun dul ar aghaidh leis an tsuiteáil. An leagan atá agat faoi láthair: %s"
+INSTL_DATABASE_INVALID_SQLSRV_VERSION="Teastaíonn SQL Server R2 (10.50.1600.1) nó níos airde uait chun dul ar aghaidh leis an tsuiteáil. An leagan atá agat faoi láthair: %s"
+INSTL_DATABASE_INVALID_SQLZURE_VERSION="Teastaíonn SQL Server R2 (10.50.1600.1) nó níos airde uait chun dul ar aghaidh leis an tsuiteáil. An leagan atá agat faoi láthair: %s"
+INSTL_DATABASE_INVALID_TYPE="Roghnaigh cineál an bhunachair sonraí"
+INSTL_DATABASE_NAME_TOO_LONG="Ní cheadaítear níos mó ná 64 carachtar in ainm an bhunachair sonraí MySQL."
+INSTL_DATABASE_INVALID_NAME="MySQL versions previous to 5.1.6 may not contain periods or other &quot;special&quot; characters in the name. Your version is: %s"
+INSTL_DATABASE_NAME_INVALID_SPACES="Ní cheadaítear spás ag tús nó ag deireadh an ainm atá ar thábla nó ar bhunachar sonraí MySQL."
+INSTL_DATABASE_NAME_INVALID_CHAR="Ní cheadaítear carachtar NUL (ASCII 0x00) in aitheantóir MySQL."
+INSTL_DATABASE_FILE_DOES_NOT_EXIST="Níl comhad %s ann"
+
+;controllers
+INSTL_COOKIES_NOT_ENABLED="Cookies do not appear to be enabled on your browser client. You will not be able to install the application with this feature disabled. Alternatively, there could also be a problem with the server's <strong>session.save_path</strong>. If this is the case, please consult your hosting provider if you don't know how to check or fix this yourself."
+INSTL_HEADER_ERROR="Earráid"
+
+;Helpers
+INSTL_PAGE_TITLE="Suiteálaí Gréasáin Joomla!"
+
+;Configuration model
+INSTL_ERROR_CONNECT_DB="Ní fhéadfaí ceangal leis an mbunachar sonraí. Fuarthas cód %s"
+INSTL_STD_OFFLINE_MSG="Tá an suíomh seo as líne le haghaidh cothabhála.<br />Bain triail eile as go luath."
+
+;FTP model
+INSTL_FTP_INVALIDROOT="The specified FTP Folder is not the folder of this Joomla! installation"
+INSTL_FTP_NOCONNECT="Ní fhéadfaí ceangal leis an bhfreastalaí FTP"
+INSTL_FTP_NODELE="Theip ar an bhfeidhm &quot;DELE&quot;."
+INSTL_FTP_NODIRECTORYLISTING="Níorbh fhéidir liostáil na bhfillteán a fháil ón bhfreastalaí FTP."
+INSTL_FTP_NOLIST="Theip ar an bhfeidhm &quot;LIST&quot;."
+INSTL_FTP_NOLOGIN="Níorbh fhéidir logáil isteach san fhreastalaí FTP."
+INSTL_FTP_NOMKD="Theip ar an bhfeidhm &quot;MKD&quot;."
+INSTL_FTP_NONLST="Theip ar an bhfeidhm &quot;NLST&quot;."
+INSTL_FTP_NOPWD="Theip ar an bhfeidhm &quot;PWD&quot;."
+INSTL_FTP_NORETR="Theip ar an bhfeidhm &quot;RETR&quot;."
+INSTL_FTP_NORMD="Theip ar an bhfeidhm &quot;RMD&quot;."
+INSTL_FTP_NOROOT="Níorbh fhéidir teacht ar an bhfillteán roghnaithe FTP."
+INSTL_FTP_NOSTOR="Theip ar an bhfeidhm &quot;STOR&quot;."
+INSTL_FTP_NOSYST="Theip ar an bhfeidhm &quot;SYST&quot;."
+INSTL_FTP_UNABLE_DETECT_ROOT_FOLDER="Níorbh fhéidir an fréamhfhillteán FTP a bhrath go huathoibríoch."
+
+;others
+INSTL_CONFPROBLEM="Your configuration file or folder is not writable or there was a problem creating the configuration file. You will have to upload the following code by hand. Select in the text area to highlight all of the code and then paste into a new text file. Name this file 'configuration.php' and upload it to your site root folder."
+INSTL_DATABASE_SUPPORT="Tacaíocht do Bhunachar Sonraí:"
+INSTL_DISPLAY_ERRORS="Taispeáin Earráidí"
+INSTL_ERROR_DB="Tharla earráidí agus an bunachar sonraí á líonadh: %s"
+INSTL_ERROR_INITIALISE_SCHEMA="Ní féidir scéimre an bhunachair sonraí a thúsú"
+INSTL_FILE_UPLOADS="Uaslódálacha"
+INSTL_GNU_GPL_LICENSE="Ceadúnas Ginearálta Poiblí GNU"
+INSTL_JSON_SUPPORT_AVAILABLE="Tacaíocht JSON"
+INSTL_MAGIC_QUOTES_GPC="Magic Quotes GPC Off"
+INSTL_MAGIC_QUOTES_RUNTIME="Magic Quotes Runtime"
+INSTL_MB_LANGUAGE_IS_DEFAULT="MB Language is Default"
+INSTL_MB_STRING_OVERLOAD_OFF="MB String Overload Off"
+INSTL_NOTICEMBLANGNOTDEFAULT="PHP mbstring language is not set to neutral. This can be set locally by entering <strong>php_value mbstring.language neutral</strong> in your <code>.htaccess</code> file."
+INSTL_NOTICEMBSTRINGOVERLOAD="PHP mbstring function overload is set. This can be turned off locally by entering <strong>php_value mbstring.func_overload 0</strong> in your <code>.htaccess</code> file."
+INSTL_NOTICEYOUCANSTILLINSTALL="<br />You can still continue the installation as the configuration settings will be displayed at the end. You will have to manually upload the code. Select in the text area to highlight all of the code and then paste into a new text file. Name this file 'configuration.php' and upload it to your site root folder."
+INSTL_OUTPUT_BUFFERING="Maolánú Aschuir"
+INSTL_PARSE_INI_FILE_AVAILABLE="Parsálaí INI"
+INSTL_PHP_VERSION="Leagan PHP"
+INSTL_PHP_VERSION_NEWER="Leagan PHP >= %s"
+INSTL_REGISTER_GLOBALS="Register Globals Off"
+INSTL_SAFE_MODE="Mód Slán"
+INSTL_SESSION_AUTO_START="Uath-thosú Seisiún"
+INSTL_WRITABLE="%s Inscríofa"
+INSTL_XML_SUPPORT="Tacaíocht XML"
+INSTL_ZIP_SUPPORT_AVAILABLE="Tacaíocht Dhúchasach ZIP"
+INSTL_ZLIB_COMPRESSION_SUPPORT="Tacaíocht Zlib"
+INSTL_PROCESS_BUSY="Tá an próiseas ar siúl. Fan nóiméad..."
+
+;Global strings
+JADMINISTRATOR="Riarthóir"
+JCHECK_AGAIN="Seiceáil Arís"
+JERROR="Earráid"
+JEMAIL="Ríomhphost"
+JGLOBAL_ISFREESOFTWARE="Is saorbhogearra é %s, ar fáil de réir an %s."
+JGLOBAL_LANGUAGE_VERSION_NOT_PLATFORM="Ní mheaitseálann an pacáiste teanga an leagan seo de Joomla!. Seans go mbeidh roinnt teaghrán ar iarraidh."
+JGLOBAL_SELECT_AN_OPTION="Roghnaigh rogha"
+JGLOBAL_SELECT_NO_RESULTS_MATCH="Toradh ar bith"
+JGLOBAL_SELECT_SOME_OPTIONS="Roghnaigh roinnt roghanna"
+JINVALID_TOKEN="Diúltaíodh an t-iarratas is déanaí toisc go raibh ceadchomhartha slándála neamhbhailí ann. Athlódáil an leathanach agus bain triail eile as."
+JNEXT="Ar Aghaidh"
+JNO="Níl"
+JNOTICE="Fógra"
+JOFF="As"
+JON="Ann"
+JPREVIOUS="Roimhe Seo"
+JSITE="Suíomh"
+JUSERNAME="Ainm Úsáideora"
+JYES="Tá"
+
+; Framework strings necessary when no lang pack is available
+JLIB_DATABASE_ERROR_CONNECT_MYSQL="Ní fhéadfaí ceangal le MySQL."
+JLIB_DATABASE_ERROR_DATABASE="Tharla earráid leis an mbunachar sonraí."
+JLIB_DATABASE_ERROR_LOAD_DATABASE_DRIVER="Níorbh fhéidir Tiománaí an Bhunachair Shonraí a lodáil: %s"
+JLIB_ENVIRONMENT_SESSION_EXPIRED="Tá an seisiún imithe as feidhm, lódáil an leathanach arís."
+JLIB_FILESYSTEM_ERROR_COPY_FAILED="Theip ar an gcóipeáil."
+JLIB_FILESYSTEM_ERROR_PATH_IS_NOT_A_FOLDER_FILES="JFolder: :files: Ní fillteán an cosán. Path: %s"
+JLIB_FORM_FIELD_INVALID="Réimse neamhbhailí:&#160;"
+JLIB_FORM_VALIDATE_FIELD_INVALID="Réimse neamhbhailí: %s"
+JLIB_FORM_VALIDATE_FIELD_REQUIRED="Réimse ag teastáil: %s"
+JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :Install: Theip ar chomhad %1$s a chóipeáil go %2$s."
+JLIB_INSTALLER_NOT_ERROR="Má bhaineann an earráid le suiteáil na gcomhad teanga TinyMCE ní bhíonn aon tionchar aige ar shuiteáil na teanga/dteangacha. Is féidir go ndéanfaidh roinnt pacáistí teanga a cruthaíodh roimh Joomla! 3.2.0 iarracht comhaid teanga TinyMCE ar leith a shuiteáil. Mar go bhfuil siad seo sa chroíchuid anois níl gá a suiteáil a thuilleadh."
+JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: Ní fhéadfaí ceangal le bunachar sonraí <br />joomla.library: %1$s - %2$s"
+
+; Strings for the language debugger
+JDEBUG_LANGUAGE_FILES_IN_ERROR="Earráidí parsála i gcomhaid teanga"
+JDEBUG_LANGUAGE_UNTRANSLATED_STRING="Teaghráin gan aistriúchán"
+JNONE="Dada"
+
+; Necessary for errors
+ADMIN_EMAIL="Seoladh R-Phoist an Riarthóra"
+ADMIN_PASSWORD="Focal Faire an Riarthóra"
+ADMIN_PASSWORD2="Dearbhaigh Focal Faire an Riarthóra"
+SITE_NAME="Ainm an tSuímh"
+
+; Database types (allows for a more descriptive label than the internal name)
+MYSQL="MySQL"
+MYSQLI="MySQLi"
+ORACLE="Oracle"
+PDOMYSQL="MySQL (PDO)"
+POSTGRESQL="PostgreSQL"
+SQLAZURE="Microsoft SQL Azure"
+SQLITE="SQLite"
+SQLSRV="Microsoft SQL Server"
diff --git a/installation/language/ga-IE/ga-IE.xml b/installation/language/ga-IE/ga-IE.xml
new file mode 100644
index 0000000000000..c891a4903170f
--- /dev/null
+++ b/installation/language/ga-IE/ga-IE.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metafile
+	version="3.5"
+	client="installation">
+	<name>Irish (ga-IE)</name>
+	<version>3.5.0</version>
+	<creationDate>2015-11-10</creationDate>
+	<author>Irish translation team</author>
+	<copyright>Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<description>Irish installation language</description>
+	<files>
+		<filename>ga-IE.ini</filename>
+	</files>
+	<metadata>
+		<name>Irish (Gaeilge-Éire)</name>
+		<tag>ga-IE</tag>
+		<rtl>0</rtl>
+	</metadata>
+	<params />
+</metafile>
diff --git a/installation/language/hy-AM/hy-AM.ini b/installation/language/hy-AM/hy-AM.ini
index d3eba53e34a30..1620aff1bf373 100644
--- a/installation/language/hy-AM/hy-AM.ini
+++ b/installation/language/hy-AM/hy-AM.ini
@@ -20,7 +20,7 @@ INSTL_WARNJSON="Ձեր սպասարկչի PHP կարգավորումներում
 ;Preinstall view
 INSTL_PRECHECK_TITLE="Նախնական ստուգում"
 INSTL_PRECHECK_DESC="Եթե ստորև նշված կայանքներից որևէ մեկը չի աջակցվում (կողքը ցուցարդվում է <strong class="_QQ_"label label-important"_QQ_">Ոչ</strong> պիտակը), խնդրում ենք կատարել անհրաժեշտ գործողություններ՝ հայտնաբերված խնդիրները վերացնելու համար։<br />Դուք չեք կարողանա տեղակայել Joomla-ն մինչև բոլոր այս պահանջները չբավարարվեն։"
-INSTL_PRECHECK_RECOMMENDED_SETTINGS_TITLE="Հանձնարարելի կայանքները՝"
+INSTL_PRECHECK_RECOMMENDED_SETTINGS_TITLE="Հանձնարարելի կայանքներ"
 INSTL_PRECHECK_RECOMMENDED_SETTINGS_DESC="Այս կայանքները հանձնարարելի են PHP-ի համար՝ Joomla-ի հետ ամբողջական համատեղելիությունը ապահովելու նպատակով։<br />Սակայն, Joomla-ն կգործի անգամ եթե ձեր կայանքները ամբողջությամբ չեն համապատասխանում հանձնարարելի կազմաձևմանը։"
 INSTL_PRECHECK_DIRECTIVE="Հրահանգ"
 INSTL_PRECHECK_RECOMMENDED="Հանձնարարելի"
@@ -87,7 +87,7 @@ INSTL_SAMPLE_LEARN_SET="Joomla-ի ուսուցման նմուշային տվյա
 INSTL_SAMPLE_TESTING_SET="Փորձակրկման նմուշային տվյալները (Անգլերեն)"
 INSTL_SITE_INSTALL_SAMPLE_NONE_DESC="Տեղակայել Joomla-ն միայն մեկ ընտրացանկով և մուտքի ձևով, առանց որևէհավելյալ բովանդակության։"
 INSTL_SAMPLE_BLOG_SET_DESC="Տեղակայել Joomla-ն մի քանի հոդվածով և բլոգերում կիրառվող հանգույցներով (Վերջին հոդվածներ, Առավել ընթերցվող հոդվածներ և այլն)։"
-INSTL_SAMPLE_BROCHURE_SET_DESC="Տեղակայել Joomla-ն մի քանի էջերով (Գլխավոր, Մեր մասին, Նորություններ, Հետադարձ կապ) և հանգույցներով (Որոնում, Ընտելեկան HTML, Մուտքի ձև)։"
+INSTL_SAMPLE_BROCHURE_SET_DESC="Տեղակայել Joomla-ն մի քանի էջերով (Գլխավոր, Մեր մասին, Նորություններ, Հետադարձ կապ) և հանգույցներով (Որոնում, Ընտելեկան, Մուտքի ձև)։"
 INSTL_SAMPLE_DATA_SET_DESC="Տեղակայել Joomla-ն մեկ էջով (Գլխավոր) և հանգույցներով (Վերջին հոդվածներ, Մուտքի ձև)։"
 INSTL_SAMPLE_LEARN_SET_DESC="Տեղակայել Joomla-ն՝ դրա հետ աշխատանքը նկարագրող մի քանի նմուշային հոդվածով։"
 INSTL_SAMPLE_TESTING_SET_DESC="Տեղակայել Joomla-ն բոլոր առկա ընտրացանկերի տարրերով՝ այն փորձարկելու համար։"
@@ -131,12 +131,12 @@ INSTL_COMPLETE_INSTALL_LANGUAGES="Լեզվային փաթեթների տեղակ
 INSTL_LANGUAGES="Լեզվային փաթեթների տեղակայում"
 INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE="Լեզու"
 INSTL_LANGUAGES_COLUMN_HEADER_VERSION="Տարբերակ"
-INSTL_LANGUAGES_DESC="Joomla-ի միջերեսը առկա է բազմաթիվ լեզուներով։ Նշեք ձեր նախընտրելոի լեզուները նշատուփերի օգնությամբ և տեղակայեք դրանք՝ կտտացնելով 'Հաջորդ' կոճակը։<br />Տեղեկացում՝ այս գործողությունը կտևի մոտ 10 վարկյան՝ ամեն լեզվի ներբեռման և տեղակայման մասով։ Ժամասպառումից խուսափելու համար խնդրում ենք տեղակայման համար ընտրել առավելագույնը 3 լեզու։"
-INSTL_LANGUAGES_MESSAGE_PLEASE_WAIT="Այս գործողությունը կտևի մոտ 10 վարկյան՝ ամեն լեզվի մասով։<br />Խնդրում ենք սպասել մինչև լեզուները ներբեռնվեն և տեղակայվեն …"
+INSTL_LANGUAGES_DESC="Joomla-ի միջերեսը առկա է բազմաթիվ լեզուներով։ Նշեք ձեր նախընտրելի լեզուները նշատուփերի օգնությամբ և տեղակայեք դրանք՝ կտտացնելով 'Հաջորդ' կոճակը։<br />Տեղեկացում՝ այս գործողությունը կտևի մոտ 10 վայրկյան՝ ամեն լեզվի ներբեռման և տեղակայման մասով։ Ժամասպառումից խուսափելու համար խնդրում ենք տեղակայման համար ընտրել առավելագույնը 3 լեզու։"
+INSTL_LANGUAGES_MESSAGE_PLEASE_WAIT="Այս գործողությունը կտևի մոտ 10 վայրկյան՝ ամեն լեզվի մասով։<br />Խնդրում ենք սպասել լեզուների ներբեռմանը և տեղակայմանը …"
 INSTL_LANGUAGES_MORE_LANGUAGES="Կտտացրեք 'Նախորդ' կոճակը, եթե ցանկանում եք տեղակայել ավել լեզուներ։"
 INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="Տեղակայման համար որևէ լեզու չի ընտրվել։ Եթե ցանկանում եք տեղակայել ավել լեզուներ, կտտացրեք 'Նախորդ' կոճակը և նշեք նախընտրելի լեզուները՝ ցանկից։"
 INSTL_LANGUAGES_WARNING_NO_INTERNET="Չհաջողվեց միանալ լեզվային սպասարկչին։ Խնդրում ենք ավարտել տեղակայման գործընթացը։"
-INSTL_LANGUAGES_WARNING_NO_INTERNET2="Տեղեկացում՝ դուք հետագայում հնարավորություն կունենաք տեղակայել լեզուները՝ Joomla-ի վարչական մասում։"
+INSTL_LANGUAGES_WARNING_NO_INTERNET2="Տեղեկացում՝ դուք հետագայում հնարավորություն կունենաք տեղակայել լեզուները՝ Joomla-ի վարչական մասից։"
 INSTL_LANGUAGES_WARNING_BACK_BUTTON="Վերադառնալ տեղակայման վերջին քայլին"
 
 ;Default language view
@@ -145,8 +145,8 @@ INSTL_DEFAULTLANGUAGE_ACTIVATE_MULTILANGUAGE_DESC="Ակտիվացնելու դե
 INSTL_DEFAULTLANGUAGE_ACTIVATE_LANGUAGE_CODE_PLUGIN="Միացնել լեզվային կոդի խրվակը"
 INSTL_DEFAULTLANGUAGE_ACTIVATE_LANGUAGE_CODE_PLUGIN_DESC="Միացնելու դեպքում, լեզվային կոդի խրվակը կապահովի ձեր էջերի լեզվային կոդը փոխելու հնարավորությունը՝ SEO-ն լավացնելու նպատակով։"
 INSTL_DEFAULTLANGUAGE_ADMINISTRATOR="Լռելյայն վարչական լեզուն"
-INSTL_DEFAULTLANGUAGE_ADMIN_COULDNT_SET_DEFAULT="Չհաջողվեց կայել այս լեզուն որպես լռելյայն։ Կայքի վարչական մասում որպես լռելյայն լեզու դրա փոխարեն կկիրառվի Անգլերենը։"
-INSTL_DEFAULTLANGUAGE_ADMIN_SET_DEFAULT="Joomla-ում %s-ը կայված է որպես ձեր լռելյայն ՎԱՐՉԱԿԱՆ լեզուն։"
+INSTL_DEFAULTLANGUAGE_ADMIN_COULDNT_SET_DEFAULT="Չհաջողվեց նշանակել այս լեզուն որպես լռելյայն։ Կայքի վարչական մասում որպես լռելյայն լեզու դրա փոխարեն կկիրառվի Անգլերենը։"
+INSTL_DEFAULTLANGUAGE_ADMIN_SET_DEFAULT="Joomla-ում %s-ը նշանակված է որպես ՎԱՐՉԱԿԱՆ մասի ձեր լռելյայն լեզուն։"
 INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_SELECT="Ընտրել"
 INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_LANGUAGE="Լեզու"
 INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_TAG="Պիտակ"
@@ -165,7 +165,7 @@ INSTL_DEFAULTLANGUAGE_COULD_NOT_UNPUBLISH_MOD_DEFAULTMENU="Չհաջողվեց ա
 INSTL_DEFAULTLANGUAGE_DESC="Հետևյալ լեզուները հաջողությամբ տեղակայվեցին։ Խնդրում ենք նշել ձեր նախընտրելի լեզուն Joomla-ի վարչական մասի համար։"
 INSTL_DEFAULTLANGUAGE_DESC_FRONTEND="Հետևյալ լեզուները հաջողությամբ տեղակայվեցին։ Խնդրում ենք նշել ձեր նախընտրելի լեզուն Joomla-ի ճակատային մասի համար։"
 INSTL_DEFAULTLANGUAGE_FRONTEND="Կայքի լռելյայն լեզուն"
-INSTL_DEFAULTLANGUAGE_FRONTEND_COULDNT_SET_DEFAULT="Չհաջողվեց կայել այս լեզուն որպես լռելյայն։ Կայքի ճակատային մասում որպես լռելյայն լեզու դրա փոխարեն կկիրառվի Անգլերենը։"
+INSTL_DEFAULTLANGUAGE_FRONTEND_COULDNT_SET_DEFAULT="Չհաջողվեց նշանակել այս լեզուն որպես լռելյայն։ Կայքի ճակատային մասում որպես լռելյայն լեզու դրա փոխարեն կկիրառվի Անգլերենը։"
 INSTL_DEFAULTLANGUAGE_FRONTEND_SET_DEFAULT="%s լեզուն նշված է որպես ձեր լռելյայն լեզու։"
 INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT="Տեղակայել բազմալեզու բովանդակությունը"
 INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT_DESC="Ակտիվացնելու դեպքում, Joomla-ն ինքնաբար կստեղծի ամեն տեղակայված լեզվի համար մեկ բովանդակության կարգ։ Բացի այդ, ամեն կարգում կստեղծվի նմուշային պարունակությամբ մեկ ընտրյալ հոդված։"
@@ -262,7 +262,7 @@ INSTL_PROCESS_BUSY="Տեղակայման գործողությունը ընթաց
 JADMINISTRATOR="Վարչական"
 JCHECK_AGAIN="Կրկին ստուգեք"
 JERROR="Սխալ"
-JEMAIL="Ուղարկել էլ-փոստով"
+JEMAIL="Էլ-փոստ"
 JGLOBAL_ISFREESOFTWARE="%s՝ ազատ ծրագրաշար է, որը տարածվում է %s արտոնագրով։"
 JGLOBAL_LANGUAGE_VERSION_NOT_PLATFORM="Լեզվային փաթեթը չի համապատասխանում տվյալ Joomla-ի տարբերակին։ Որոշ տողերի թարգմանությունը կարող է բացակայել։"
 JGLOBAL_SELECT_AN_OPTION="Ընտրեք կայանքը"
diff --git a/installation/language/hy-AM/hy-AM.xml b/installation/language/hy-AM/hy-AM.xml
index b33413768dd0a..0781dd5ad0095 100644
--- a/installation/language/hy-AM/hy-AM.xml
+++ b/installation/language/hy-AM/hy-AM.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <metafile
-	version="3.4"
+	version="3.5"
 	client="installation">
 	<name>Armenian (hy-AM)</name>
-	<version>3.4.2</version>
-	<creationDate>2015-07-08</creationDate>
+	<version>3.5.0</version>
+	<creationDate>2015-09-10</creationDate>
 	<author>Andrey Aleksanyants</author>
 	<copyright>Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
diff --git a/installation/language/it-IT/it-IT.ini b/installation/language/it-IT/it-IT.ini
index 1e940cefc5675..f7530a37c807d 100644
--- a/installation/language/it-IT/it-IT.ini
+++ b/installation/language/it-IT/it-IT.ini
@@ -87,7 +87,7 @@ INSTL_SAMPLE_LEARN_SET="Dati di esempio Inglesi (GB) Learn Joomla"
 INSTL_SAMPLE_TESTING_SET="Dati di esempio Inglesi (GB) Test"
 INSTL_SITE_INSTALL_SAMPLE_NONE_DESC="Installa Joomla con un solo menu ed un modulo login, senza alcun contenuto."
 INSTL_SAMPLE_BLOG_SET_DESC="Installa Joomla con alcuni articoli e relativi moduli in stile blog. Questi dati di esempio sono in lingua inglese."
-INSTL_SAMPLE_BROCHURE_SET_DESC="Installa Joomla con alcune pagine (un menu con le voci Home, About Us, News, Contact Us) e moduli come Search, Custom HTML, Login Form. Questi dati di esempio sono in lingua inglese."
+INSTL_SAMPLE_BROCHURE_SET_DESC="Installa Joomla con alcune pagine (un menu con le voci Home, About Us, News, Contact Us) e moduli come Search, Custom, Login Form. Questi dati di esempio sono in lingua inglese."
 INSTL_SAMPLE_DATA_SET_DESC="Installa Joomla con una pagina (un menu con un link) e moduli come Latest Article, Login Form. Questi dati di esempio sono in lingua inglese."
 INSTL_SAMPLE_LEARN_SET_DESC="Installa Joomla con articoli di esempio che descrivono come funziona. Questi dati di esempio sono in lingua inglese."
 INSTL_SAMPLE_TESTING_SET_DESC="Installa Joomla con tutte le possibili voci di menu per aiutarti a testare la piattaforma. Questi dati di esempio sono in lingua inglese."
diff --git a/installation/language/it-IT/it-IT.xml b/installation/language/it-IT/it-IT.xml
index 4dca8cd3250b2..d1a14f6718636 100644
--- a/installation/language/it-IT/it-IT.xml
+++ b/installation/language/it-IT/it-IT.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <metafile
-	version="3.4"
+	version="3.5"
 	client="installation">
 	<name>Italian -Italy</name>
-	<version>3.4.4</version>
+	<version>3.5.0</version>
 	<creationDate>August 2015</creationDate>
 	<author>Italian Translation team</author>
 	<copyright>Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved.</copyright>
diff --git a/installation/language/km-KH/km-KH.ini b/installation/language/km-KH/km-KH.ini
index a65baadf7388e..2dff291b25c26 100644
--- a/installation/language/km-KH/km-KH.ini
+++ b/installation/language/km-KH/km-KH.ini
@@ -2,8 +2,8 @@
 ; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt
 ; Note : All ini files need to be saved as UTF-8
-
 ; Stepbar
+
 INSTL_STEP_COMPLETE_LABEL="បញ្ចប់"
 INSTL_STEP_DATABASE_LABEL="ឃ្លាំង​ទិន្នន័យ"
 INSTL_STEP_DEFAULTLANGUAGE_LABEL="ជ្រើស​ភាសា​លំនាំដើម"
@@ -82,7 +82,7 @@ INSTL_SAMPLE_LEARN_SET="ទិន្នន័យ​គំរូ​ស្វែ
 INSTL_SAMPLE_TESTING_SET="ទិន្នន័យ​គំរូ​សាកល្បង​ជា​ភាសា​អង់គ្លេស"
 INSTL_SITE_INSTALL_SAMPLE_NONE_DESC="ដំឡើង​ Joomla ដែល​មាន​តែ​ម៉ឺនុយ​ និង ទម្រង់​កត់​ចូល​មួយ​ដែល​គ្មាន​មាតិកា​ឡើយ ។"
 INSTL_SAMPLE_BLOG_SET_DESC="ដំឡើង Joomla ដែល​មាន​អត្ថបទ​មួយ​ចំនួន និង ម៉ូឌុល​ដែល​ទាក់ទង​ប្លក់​ដូចជា៖ ប្រកាស​ចាស់ៗ តំណ​ប្លក់ ប្រកាស​អាន​ច្រើន ។"
-INSTL_SAMPLE_BROCHURE_SET_DESC="ដំឡើង Joomla ដែល​មាន​ទំព័រ​មួយ​ចំនួន (ម៉ឺនុយ​ដែល​មាន​ទំព័រ ទំព័រ​ដើម, អំពី​យើង, ដំណឹង, ទាក់ទង​យើង) និង​ម៉ូឌុល​មួយ​ចំនួន​ដូច​ជា ស្វែងរក, HTML តាម​បំណង, ទម្រង់​កត់​ចូល ។"
+INSTL_SAMPLE_BROCHURE_SET_DESC="ដំឡើង Joomla ដែល​មាន​ទំព័រ​មួយ​ចំនួន (ម៉ឺនុយ​ដែល​មាន​ទំព័រ ទំព័រ​ដើម, អំពី​យើង, ដំណឹង, ទាក់ទង​យើង) និង​ម៉ូឌុល​មួយ​ចំនួន​ដូច​ជា ស្វែងរក, តាម​បំណង, ទម្រង់​កត់​ចូល ។"
 INSTL_SAMPLE_DATA_SET_DESC="ដំឡើង Joomla ដែល​មាន​មួយ​ទំព័រ (ម៉ឺនុយ​មាន​តំណ​មួយ) និង ម៉ូឌុល​មួយ​ចំនួន​ដូចជា​អត្ថបទ​ថ្មី, ទម្រង់​កត់​ចូល ។"
 INSTL_SAMPLE_LEARN_SET_DESC="ដំឡើង Joomla មាន​អត្ថបទ​គំរូ​ពិពណ៌នា​អំពី​របៀប​ដែល Joomla ដំណើរការ ។"
 INSTL_SAMPLE_TESTING_SET_DESC="ដំឡើង Joomla មាន​ម៉ឺនុយ​ច្រើន​យ៉ាង​ដែល​ជួយ​ក្នុង​ការ​សាកល្បង Joomla ។"
@@ -115,12 +115,12 @@ INSTL_COMPLETE_ERROR_FOLDER_DELETE="ថត​ឯកសារ​ដំឡើង
 INSTL_COMPLETE_FOLDER_REMOVED="ថត​ឯកសារ​ដំឡើង​លុប​ចេញ​បាន​ដោយ​ជោគជ័យ ។"
 INSTL_COMPLETE_LANGUAGE_1="Joomla! ក្នុង​ភាសា​ផ្ទាល់​ខ្លួន​អ្នក និង/ឬ ការ​បង្កើត​ស្ថាន​បណ្ដាញ​ពហុ​ភាសា​កំណើត​មូលដ្ឋាន"
 ; The word 'installation' should not be translated as it is a physical folder.
-INSTL_COMPLETE_LANGUAGE_DESC="មុន​នឹង​លុប​ថត​ដំឡើង​ចេញ អ្នក​អាច​ដំឡើង​ភាសា​បន្ថែម​បាន។ ប្រសិនបើ​អ្នក​ចង់​បន្ថែម​ភាសា​ផ្សេង​ចូល​ក្នុង​កម្មវិធី Joomla! សូម​ជ្រើសរើស​ប៊ូតុង​ខាងក្រោម ។"
-INSTL_COMPLETE_LANGUAGE_DESC2="ចំណាំ៖ អ្នក​ត្រូវការ​ចូល​ដំណើរការ​អ៊ីនធឺណិត​សម្រាប់ Joomla! ទាញ​យក និង​ដំឡើង​ភាសា​ថ្មីៗ។ <br />ការកំណត់​រចនាសម្ព័ន្ធ​របស់​ម៉ាស៊ីន​បម្រើ​មួយចំនួន​ពុំ​អនុញ្ញាត Joomla! ឲ្យ​ដំឡើង​ភាសា​បាន​ឡើយ។ ប្រសិនបើ អ្នក​ស្ថិត​ក្នុង​ករណី​នេះ ពុំ​បារម្ភ​អ្វី អ្នក​នឹង​អាច​ដំឡើង​ភាសា​ទាំង​នោះ​ ក្រោយ​ប្រើប្រាស់​កម្មវិធី​គ្រប់គ្រង Joomla! ឆាក​ក្រោយ ។"
+INSTL_COMPLETE_LANGUAGE_DESC="មុន​នឹង​លុប​ថត​ដំឡើង installation ចេញ អ្នក​អាច​ដំឡើង​ភាសា​បន្ថែម​បាន។ ប្រសិនបើ​អ្នក​ចង់​បន្ថែម​ភាសា​ផ្សេង​ចូល​ក្នុង​កម្មវិធី Joomla! សូម​ជ្រើសរើស​ប៊ូតុង​ខាងក្រោម ។"
+INSTL_COMPLETE_LANGUAGE_DESC2="ចំណាំ៖ អ្នក​ត្រូវការ​ចូល​ដំណើរការ​អ៊ីនធឺណិត​សម្រាប់ Joomla! ទាញ​យក និង​ដំឡើង​ភាសា​ថ្មីៗ។ <br />ការកំណត់​រចនាសម្ព័ន្ធ​របស់​ម៉ាស៊ីន​បម្រើ​មួយចំនួន​ពុំ​អនុញ្ញាត Joomla! ឲ្យ​ដំឡើង​ភាសា​បាន​ឡើយ។ ប្រសិនបើ អ្នក​ស្ថិត​ក្នុង​ករណី​នេះ កុំ​បារម្ភ​អ្វី អ្នក​នឹង​អាច​ដំឡើង​ភាសា​ទាំង​នោះ​ ក្រោយ​ប្រើប្រាស់​កម្មវិធី​គ្រប់គ្រង Joomla! ឆាក​ក្រោយ ។"
 ; The word 'installation' should not be translated as it is a physical folder.
-INSTL_COMPLETE_REMOVE_FOLDER="លុប​ថត​ដំឡើង​"
+INSTL_COMPLETE_REMOVE_FOLDER="លុប​ថត​ដំឡើង​ installation"
 ; The word 'installation' should not be translated as it is a physical folder.
-INSTL_COMPLETE_REMOVE_INSTALLATION="សូម​ចាំ​ថា​ត្រូវ​​លុប​ថត​ឯកសារ​ដំឡើង​ (installation) ចេញ ។<br />អ្នក​នឹង​ពុំ​អាច​បន្ត​ផុត​ពី​ចំណុច​នេះ​ទេ លុះត្រា​តែ​ថត​ដំឡើង​ installation នេះ​ត្រូវ​បាន​លុប​ចេញ ។ នេះ​ជា​មុខងារ​សុវត្ថិភាព​របស់ Joomla! ។"
+INSTL_COMPLETE_REMOVE_INSTALLATION="សូម​ចាំ​ថា​ត្រូវ​​លុប​ថត​ឯកសារ​ដំឡើង​ installation ចេញ ។<br />អ្នក​នឹង​ពុំ​អាច​បន្ត​ផុត​ពី​ចំណុច​នេះ​ទេ លុះត្រា​តែ​ថត​ដំឡើង​ installation នេះ​ត្រូវ​បាន​លុប​ចេញ ។ នេះ​ជា​មុខងារ​សុវត្ថិភាព​របស់ Joomla! ។"
 INSTL_COMPLETE_TITLE="អបអរ​សាទរ​លោក​អ្នក! ឥឡូវនេះ Joomla! បាន​ដំឡើង​រួចរាល់​ហើយ ។"
 INSTL_COMPLETE_INSTALL_LANGUAGES="ជំហាន​បន្ថែម៖ ដំឡើង​ភាសា"
 ; Languages view
diff --git a/installation/language/km-KH/km-KH.xml b/installation/language/km-KH/km-KH.xml
index d02bdf8173675..3d92f359a6ab2 100644
--- a/installation/language/km-KH/km-KH.xml
+++ b/installation/language/km-KH/km-KH.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<metafile version="3.4" client="installation">
+<metafile version="3.5" client="installation">
 	<name>Khmer ភាសាខ្មែរ (Cambodia)</name>
-	<version>3.4.4</version>
+	<version>3.5.0</version>
 	<creationDate>August 2015</creationDate>
 	<author>Khmer Translation Team</author>
 	<authorEmail>info@km-kh.org</authorEmail>
diff --git a/installation/language/ko-KR/ko-KR.ini b/installation/language/ko-KR/ko-KR.ini
index c047cd79844b9..131e74ec7bc3e 100644
--- a/installation/language/ko-KR/ko-KR.ini
+++ b/installation/language/ko-KR/ko-KR.ini
@@ -89,7 +89,7 @@ INSTL_SAMPLE_LEARN_SET="Joomla 배우기 영어(GB) 샘플 데이터"
 INSTL_SAMPLE_TESTING_SET="테스트 영어(GB) 샘플 데이터"
 INSTL_SITE_INSTALL_SAMPLE_NONE_DESC="다른 컨텐츠 없이 로그인 양식과 하나의 메뉴만 줌라에 설치합니다."
 INSTL_SAMPLE_BLOG_SET_DESC="지난 포스트, 블로그 규칙, 가장 많이 읽은 포스트 등과 같은 몇개의 아티클만 줌라에 설치합니다."
-INSTL_SAMPLE_BROCHURE_SET_DESC="몇개의 페이지(Home과 같은 메뉴, About us, 뉴스, 연락처)와 검색, Custom HTML, 로그인 양식과 같은 모듈만 줌라에 설치합니다."
+INSTL_SAMPLE_BROCHURE_SET_DESC="몇 개의 페이지(Home과 같은 메뉴, About us, 뉴스, 연락처)와 검색, 사용자 정의, 로그인 폼과 같은 모듈만 줌라에 설치합니다."
 INSTL_SAMPLE_DATA_SET_DESC="하나의 페이지(링크와 같은 메뉴)와 최신 아티클, 로그인 양식과 같은 모듈을 줌라에 설치합니다."
 INSTL_SAMPLE_LEARN_SET_DESC="줌라가 어떻게 작동하는지를 알려주는 예제 아티클을 줌라에 설치합니다."
 INSTL_SAMPLE_TESTING_SET_DESC="줌라를 테스트하는데 도움을 주는 가능한 모든 메뉴 아이템을 줌라에 설치합니다."
diff --git a/installation/language/ko-KR/ko-KR.xml b/installation/language/ko-KR/ko-KR.xml
index 67d7cd2e7a387..6f7174ffcdd50 100644
--- a/installation/language/ko-KR/ko-KR.xml
+++ b/installation/language/ko-KR/ko-KR.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <metafile
-	version="3.4"
+	version="3.5"
 	client="installation">
 	<name>Korean (Republic of Korea)</name>
-	<version>3.4.4</version>
+	<version>3.5.0</version>
 	<creationDate>August 2015</creationDate>
 	<author>Korean translation team</author>
 	<copyright>Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved.</copyright>
diff --git a/installation/language/mk-MK/mk-MK.ini b/installation/language/mk-MK/mk-MK.ini
index 238472f660eeb..5bfbaa17dcafa 100644
--- a/installation/language/mk-MK/mk-MK.ini
+++ b/installation/language/mk-MK/mk-MK.ini
@@ -97,7 +97,7 @@ INSTL_SITE_INSTALL_SAMPLE_NONE_DESC="Инсталирање Joomla со само
 INSTL_SAMPLE_BLOG_SET="Англиски (GB) блог примери"
 INSTL_SAMPLE_BLOG_SET_DESC="Инсталирање Joomla со неколку артикли и блог ориентирани модули како Постари постови, Блогрол, Најчитани."
 INSTL_SAMPLE_BROCHURE_SET="Англиски (GB) примери за брошури"
-INSTL_SAMPLE_BROCHURE_SET_DESC="Инсталирање Joomla со неколку страници (мени со деловите Почетна, За нас, Новости, Контакт) и модули како Барај, HTML по желба, Најавна форма."
+INSTL_SAMPLE_BROCHURE_SET_DESC="Инсталирање Joomla со неколку страници (мени со деловите Почетна, За нас, Новости, Контакт) и модули како Барај, Код по желба, Најавна форма."
 INSTL_SAMPLE_DATA_SET="Англиски (GB) основни примери"
 INSTL_SAMPLE_DATA_SET_DESC="Инсталирање Joomla со една страница (мени со еден дел) и модули како Најнови артикли, Најавна форма."
 INSTL_SAMPLE_LEARN_SET="Англиски (GB) примери учење Joomla"
diff --git a/installation/language/mk-MK/mk-MK.xml b/installation/language/mk-MK/mk-MK.xml
index be8d542fc19e5..b3ea13ba12ba1 100644
--- a/installation/language/mk-MK/mk-MK.xml
+++ b/installation/language/mk-MK/mk-MK.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <metafile
-	version="3.4"
+	version="3.5"
 	client="installation">
 	<name>Macedonian Македонски (MК)</name>
-	<version>3.4.4</version>
+	<version>3.5.0</version>
 	<creationDate>August 2015</creationDate>
 	<author>Macedonian Translation Team</author>
 	<copyright>Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved.</copyright>
diff --git a/installation/language/pt-BR/pt-BR.ini b/installation/language/pt-BR/pt-BR.ini
index ff2920e2dd10b..69cdbe63edc44 100644
--- a/installation/language/pt-BR/pt-BR.ini
+++ b/installation/language/pt-BR/pt-BR.ini
@@ -87,7 +87,7 @@ INSTL_SAMPLE_LEARN_SET="Conteúdo de exemplo Aprenda Joomla, em inglês (GB)"
 INSTL_SAMPLE_TESTING_SET="Conteúdo de exemplo Teste, em inglês (GB)"
 INSTL_SITE_INSTALL_SAMPLE_NONE_DESC="Instale o Joomla com apenas um menu e um formulário de acesso, sem qualquer conteúdo."
 INSTL_SAMPLE_BLOG_SET_DESC="Instalar o Joomla com alguns artigos e módulos relacionados a blogs, como Posts mais antigos, Lista de Blogs, Posts mais lidos."
-INSTL_SAMPLE_BROCHURE_SET_DESC="Instale o Joomla com algumas páginas (um menu com páginas Home, Sobre, Notícias, Fale Conosco) e módulos como Busca, HTML personalizado, Formulário de Acesso."
+INSTL_SAMPLE_BROCHURE_SET_DESC="Instale o Joomla com algumas páginas (um menu com páginas Home, Sobre, Notícias, Fale Conosco) e módulos como Busca, HTML personalizado e Formulário de Acesso."
 INSTL_SAMPLE_DATA_SET_DESC="Instale o Joomla com uma página (um menu com um link) e módulos como Últimos Artigos, Formulário de Acesso."
 INSTL_SAMPLE_LEARN_SET_DESC="Instale o Joomla com conteúdo de exemplo que descrevem como o Joomla funciona."
 INSTL_SAMPLE_TESTING_SET_DESC="Instale o Joomla com todos os itens de menu possíveis para ajudar a testar o Joomla."
@@ -116,13 +116,19 @@ INSTL_EMAIL_NOT_SENT="O email não pôde ser enviado."
 
 ;Complete view
 INSTL_COMPLETE_ADMINISTRATION_LOGIN_DETAILS="Detalhes de Acesso ao Administrador"
+; The word 'installation' should not be translated as it is a physical folder.
 INSTL_COMPLETE_ERROR_FOLDER_ALREADY_REMOVED="O diretório installation já foi removido."
+; The word 'installation' should not be translated as it is a physical folder.
 INSTL_COMPLETE_ERROR_FOLDER_DELETE="O diretório installation não pôde ser removido. Remova-o manualmente."
+; The word 'installation' should not be translated as it is a physical folder.
 INSTL_COMPLETE_FOLDER_REMOVED="Diretório installation removida com sucesso."
 INSTL_COMPLETE_LANGUAGE_1="Joomla! em seu idioma e/ou criação básica de um site multi-idioma"
+; The word 'installation' should not be translated as it is a physical folder.
 INSTL_COMPLETE_LANGUAGE_DESC="Antes de remover o diretório installation, você pode instalar outros idiomas. Se deseja adicionar outros idiomas em seu aplicativo Joomla!, clique no botão a seguir."
 INSTL_COMPLETE_LANGUAGE_DESC2="Obs.: você precisará de acesso à internet para que o Joomla! baixe e instale novas idiomas. <br /> Algumas configurações de servidor não vão permitir que o Joomla! instale os idiomas. Se este for seu caso, não se preocupe, você poderá instalá-los depois pelo Administrador."
+; The word 'installation' should not be translated as it is a physical folder.
 INSTL_COMPLETE_REMOVE_FOLDER="Remover o diretório installation"
+; The word 'installation' should not be translated as it is a physical folder.
 INSTL_COMPLETE_REMOVE_INSTALLATION="LEMBRE DE REMOVER O DIRETÓRIO installation.<br /> Não será possível prosseguir até que o diretório installation seja removido. Este é um recurso de segurança do Joomla!"
 INSTL_COMPLETE_TITLE="Parabéns! O Joomla foi instalado com sucesso."
 INSTL_COMPLETE_INSTALL_LANGUAGES="Etapas extras: instalar idiomas"
@@ -180,7 +186,7 @@ INSTL_DEFAULTLANGUAGE_NATIVE_LANGUAGE_NAME="Inglês (UK)"
 INSTL_DATABASE_COULD_NOT_CONNECT="Não foi possível conectar ao Banco de Dados. Número retornado: %s"
 INSTL_DATABASE_COULD_NOT_CREATE_DATABASE="O instalador não pôde se conectar ao banco de dados especificado para seguir com o processo. Verifique suas configurações e, caso necessário, crie o banco de dados manualmente."
 INSTL_DATABASE_COULD_NOT_REFRESH_MANIFEST_CACHE="Não foi possível atualizar o cache do manifesto da extensão: %s"
-INSTL_DATABASE_EMPTY_NAME=""
+INSTL_DATABASE_EMPTY_NAME="23"
 INSTL_DATABASE_ERROR_BACKINGUP="Alguns erros ocorreram durante o backup do banco de dados."
 INSTL_DATABASE_ERROR_CREATE="Ocorreu um erro ao tentar criar o banco de dados %s.<br /> O usuário pode não ter privilégios suficientes para criar um banco de dados. O banco de dados deve ser criado para poder instalar o Joomla!"
 INSTL_DATABASE_ERROR_DELETE="Ocorreram alguns erros ao apagar o banco de dados."
@@ -313,3 +319,4 @@ POSTGRESQL="PostgreSQL"
 SQLAZURE="Microsoft SQL Azure"
 SQLITE="SQLite"
 SQLSRV="Microsoft SQL Server"
+
diff --git a/installation/language/pt-BR/pt-BR.xml b/installation/language/pt-BR/pt-BR.xml
index 385dd828bf596..774e34b1d6bf0 100644
--- a/installation/language/pt-BR/pt-BR.xml
+++ b/installation/language/pt-BR/pt-BR.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <metafile
-	version="3.4"
+	version="3.5"
 	client="installation">
 	<name>Português Brasileiro (pt-BR)</name>
-	<version>3.4.4</version>
+	<version>3.5.0</version>
 	<creationDate>Junho 2015</creationDate>
 	<author>Equipe de Tradução Português Brasileiro</author>
 	<copyright>Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved.</copyright>
diff --git a/installation/language/sk-SK/sk-SK.ini b/installation/language/sk-SK/sk-SK.ini
index 5d837bdd40def..af82c09a2c785 100644
--- a/installation/language/sk-SK/sk-SK.ini
+++ b/installation/language/sk-SK/sk-SK.ini
@@ -88,7 +88,7 @@ INSTL_SAMPLE_LEARN_SET="Predvolené vzorové údaje v anglickom jazyku - Naučte
 INSTL_SAMPLE_TESTING_SET="Testovacie vzorové údaje v anglickom jazyku (GB)"
 INSTL_SITE_INSTALL_SAMPLE_NONE_DESC="Nainštalovať systém Joomla len s jedným menu a prihlasovacím formulárom bez obsahu."
 INSTL_SAMPLE_BLOG_SET_DESC="Nainštalovať systém Joomla s niekoľkými článkami a súvisiacimi modulmi blogovej šablóny ako napr. Staršie príspevky, Najčítanejšie články."
-INSTL_SAMPLE_BROCHURE_SET_DESC="Nainštalovať systém Joomla s niekoľkými stránkami (menu s Hlavnou stránkou, O nás, Novinky, Kontakt) a modulmi ako Vyhľadávanie, Vlastné HTML a Prihlasovacím formulárom."
+INSTL_SAMPLE_BROCHURE_SET_DESC="Nainštalovať systém Joomla s niekoľkými stránkami (menu s Hlavnou stránkou, O nás, Novinky, Kontakt) a modulmi ako napr. Vyhľadávanie, Vlastné a Prihlasovací formulár."
 INSTL_SAMPLE_DATA_SET_DESC="Nainštalovať systém Joomla s jednou stránkou (menu s jedným odkazom) a modulmi Najnovší článok, Prihlasovací formulár."
 INSTL_SAMPLE_LEARN_SET_DESC="Nainštalovať systém Joomla s ukážkovými článkami, ktoré popisujú ako Joomla funguje."
 INSTL_SAMPLE_TESTING_SET_DESC="Nainštalovať systém Joomla so všetkými dostupnými položkami menu pre pomoc s testovaním Joomla-y."
diff --git a/installation/language/sk-SK/sk-SK.xml b/installation/language/sk-SK/sk-SK.xml
index 572773e0c5393..d8f1da47aa921 100644
--- a/installation/language/sk-SK/sk-SK.xml
+++ b/installation/language/sk-SK/sk-SK.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <metafile
-	version="3.4"
+	version="3.5"
 	client="installation">
 	<name>Slovak (Slovenčina)</name>
-	<version>3.4.4</version>
+	<version>3.5.0</version>
 	<creationDate>August 2015</creationDate>
 	<author>Joomla! Project</author>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/installation/language/sr-RS/sr-RS.ini b/installation/language/sr-RS/sr-RS.ini
index 14ee3ef75c810..df21838f3bf0e 100644
--- a/installation/language/sr-RS/sr-RS.ini
+++ b/installation/language/sr-RS/sr-RS.ini
@@ -90,7 +90,7 @@ INSTL_SAMPLE_LEARN_SET="Научите Joomla English (GB) пример"
 INSTL_SAMPLE_TESTING_SET="Тест English (GB) пример"
 INSTL_SITE_INSTALL_SAMPLE_NONE_DESC="Joomla! инсталација са само једним менијем и формом за пријављивање, без примера садржаја."
 INSTL_SAMPLE_BLOG_SET_DESC="Joomla инсталација са неколико чланака и одговарајућим блог модулима као што су модули за старе или најчитаније текстове и сл."
-INSTL_SAMPLE_BROCHURE_SET_DESC="Joomla инсталација са неколико страна (мени са ставкама: Home, About Us, News, Contact Us) и модулима за претрагу, пријаву или Custom HTML."
+INSTL_SAMPLE_BROCHURE_SET_DESC="Joomla инсталација са неколико страна (мени са ставкама: Home, About Us, News, Contact Us) и модулима за претрагу, пријаву."
 INSTL_SAMPLE_DATA_SET_DESC="Joomla инсталација са једном страном (мени са једним линком) и модулима као што су најновији чланци или форма за пријаву."
 INSTL_SAMPLE_LEARN_SET_DESC="Joomla инсталација са чланцима који описују како ради Joomla."
 INSTL_SAMPLE_TESTING_SET_DESC="Инсталација Joomle са свим могућим ставкама да би се помогло тестирање Joomle."
@@ -119,14 +119,15 @@ INSTL_EMAIL_NOT_SENT="Ел. пошта не може бити послата."
 
 ;Complete view
 INSTL_COMPLETE_ADMINISTRATION_LOGIN_DETAILS="Детаљи администраторске пријаве"
-INSTL_COMPLETE_ERROR_FOLDER_ALREADY_REMOVED="Инсталациони директоријум је већ обрисан."
-INSTL_COMPLETE_ERROR_FOLDER_DELETE="Инсталациони директоријум не може бити обрисан. Молим, обришите га ручно."
-INSTL_COMPLETE_FOLDER_REMOVED="Инсталациони директоријум је успешно обрисан"
+; The word 'installation' should not be translated as it is a physical folder.
+INSTL_COMPLETE_ERROR_FOLDER_ALREADY_REMOVED="installation директоријум је већ обрисан."
+INSTL_COMPLETE_ERROR_FOLDER_DELETE="installation директоријум не може бити обрисан. Молим, обришите га ручно."
+INSTL_COMPLETE_FOLDER_REMOVED="installation директоријум је успешно обрисан"
 INSTL_COMPLETE_LANGUAGE_1="Joomla! на вашем језику и/или аутоматско инсталирање основног вишејезичког сајта"
-INSTL_COMPLETE_LANGUAGE_DESC="Пре него што обришете инсталациони директоријум можете инсталирати додатне језике. Ако желите да додате језик за ваш сајт кликните на дугме."
+INSTL_COMPLETE_LANGUAGE_DESC="Пре него што обришете installation директоријум можете инсталирати додатне језике. Ако желите да додате језик за ваш сајт кликните на дугме."
 INSTL_COMPLETE_LANGUAGE_DESC2="Напомена: потребан вам је приступ интернету да би Joomla! могла преузети инсталирати нове језике. <br/>Неке конфигурације сервера, неће дозволити да Joomla! инсталира језике. У том случају, не брините, можете инсталирати језике касније из администраторског дела сајта."
-INSTL_COMPLETE_REMOVE_FOLDER="Обришите инсталациони директоријум"
-INSTL_COMPLETE_REMOVE_INSTALLATION="НЕМОЈТЕ ЗАБОРАВИТИ ДА ОБРИШЕТЕ ИНСТАЛАЦИОНИ ДИРЕКТОРИЈУМ<br />Нећете моћи да радите даље док се не уклони инсталациони директоријум. Ово је безбедносни корак."
+INSTL_COMPLETE_REMOVE_FOLDER="Обришите installation директоријум"
+INSTL_COMPLETE_REMOVE_INSTALLATION="НЕМОЈТЕ ЗАБОРАВИТИ ДА ОБРИШЕТЕ installation ДИРЕКТОРИЈУМ<br />Нећете моћи да радите даље док се не уклони installation директоријум. Ово је безбедносни корак."
 INSTL_COMPLETE_TITLE="Честитам! Joomla! је инсталирана."
 INSTL_COMPLETE_INSTALL_LANGUAGES="Додатни кораци: Инсталација језика"
 
diff --git a/installation/language/sr-RS/sr-RS.xml b/installation/language/sr-RS/sr-RS.xml
index 4a182ff5349c4..544a4fef13c38 100644
--- a/installation/language/sr-RS/sr-RS.xml
+++ b/installation/language/sr-RS/sr-RS.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <metafile
-	version="3.4"
+	version="3.5"
 	client="installation">
 	<name>Serbian Cyrillic</name>
-	<version>3.4.2</version>
+	<version>3.5.0</version>
 	<creationDate>17-9-2012</creationDate>
 	<author>joomla-serbia.com</author>
 	<copyright>Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved.</copyright>
diff --git a/installation/language/sr-YU/sr-YU.ini b/installation/language/sr-YU/sr-YU.ini
index d2382deea203b..fed60c575d17c 100644
--- a/installation/language/sr-YU/sr-YU.ini
+++ b/installation/language/sr-YU/sr-YU.ini
@@ -89,7 +89,7 @@ INSTL_SAMPLE_LEARN_SET="Naučite Joomla English (GB) primer"
 INSTL_SAMPLE_TESTING_SET="Test English (GB) primer"
 INSTL_SITE_INSTALL_SAMPLE_NONE_DESC="Joomla! instalacija sa samo jednim menijem i formom za prijavljivanje, bez primera sadržaja."
 INSTL_SAMPLE_BLOG_SET_DESC="Joomla instalacija sa nekoliko članaka i odgovarajućim blog modulima kao što su moduli za stare ili najčitanije tekstove i sl."
-INSTL_SAMPLE_BROCHURE_SET_DESC="Joomla instalacija sa nekoliko strana (meni sa stavkama: Home, About Us, News, Contact Us) i modulima za pretragu, prijavu ili Custom HTML."
+INSTL_SAMPLE_BROCHURE_SET_DESC="Joomla instalacija sa nekoliko strana (meni sa stavkama: Home, About Us, News, Contact Us) i modulima za pretragu, prijavu."
 INSTL_SAMPLE_DATA_SET_DESC="Joomla instalacija sa jednom stranom (meni sa jednim linkom) i modulima kao što su najnoviji članci ili forma za prijavu."
 INSTL_SAMPLE_LEARN_SET_DESC="Joomla instalacija sa člancima koji opisuju kako radi Joomla."
 INSTL_SAMPLE_TESTING_SET_DESC="Instalacija Joomle sa svim mogućim stavkama da bi se pomoglo testiranje Joomle."
@@ -118,14 +118,15 @@ INSTL_EMAIL_NOT_SENT="El. pošta ne može biti poslata."
 
 ;Complete view
 INSTL_COMPLETE_ADMINISTRATION_LOGIN_DETAILS="Detalji administratorske prijave"
-INSTL_COMPLETE_ERROR_FOLDER_ALREADY_REMOVED="Instalacioni direktorijum je već obrisan."
-INSTL_COMPLETE_ERROR_FOLDER_DELETE="Instalacioni direktorijum ne može biti obrisan. Molim, obrišite ga ručno."
-INSTL_COMPLETE_FOLDER_REMOVED="Instalacioni direktorijum je uspešno obrisan"
+; The word 'installation' should not be translated as it is a physical folder.
+INSTL_COMPLETE_ERROR_FOLDER_ALREADY_REMOVED="installation direktorijum je već obrisan."
+INSTL_COMPLETE_ERROR_FOLDER_DELETE="installation direktorijum ne može biti obrisan. Molim, obrišite ga ručno."
+INSTL_COMPLETE_FOLDER_REMOVED="installation direktorijum je uspešno obrisan"
 INSTL_COMPLETE_LANGUAGE_1="Joomla! na vašem jeziku i/ili automatsko instaliranje osnovnog višejezičkog sajta"
-INSTL_COMPLETE_LANGUAGE_DESC="Pre nego što obrišete instalacioni direktorijum možete instalirati dodatne jezike. Ako želite da dodate jezik za vaš sajt kliknite na dugme."
+INSTL_COMPLETE_LANGUAGE_DESC="Pre nego što obrišete installation direktorijum možete instalirati dodatne jezike. Ako želite da dodate jezik za vaš sajt kliknite na dugme."
 INSTL_COMPLETE_LANGUAGE_DESC2="Napomena: potreban vam je pristup internetu da bi Joomla! mogla preuzeti instalirati nove jezike. <br/>Neke konfiguracije servera, neće dozvoliti da Joomla! instalira jezike. U tom slučaju, ne brinite, možete instalirati jezike kasnije iz administratorskog dela sajta."
-INSTL_COMPLETE_REMOVE_FOLDER="Obrišite instalacioni direktorijum"
-INSTL_COMPLETE_REMOVE_INSTALLATION="NEMOJTE ZABORAVITI DA OBRIŠETE INSTALACIONI DIREKTORIJUM<br />Nećete moći da radite dalje dok se ne ukloni instalacioni direktorijum. Ovo je bezbednosni korak."
+INSTL_COMPLETE_REMOVE_FOLDER="Obrišite installation direktorijum"
+INSTL_COMPLETE_REMOVE_INSTALLATION="NEMOJTE ZABORAVITI DA OBRIŠETE installation DIREKTORIJUM<br />Nećete moći da radite dalje dok se ne ukloni installation direktorijum. Ovo je bezbednosni korak."
 INSTL_COMPLETE_TITLE="Čestitam! Joomla! je instalirana."
 INSTL_COMPLETE_INSTALL_LANGUAGES="Dodatni koraci: Instalacija jezika"
 
diff --git a/installation/language/sr-YU/sr-YU.xml b/installation/language/sr-YU/sr-YU.xml
index 6c513b689d63a..3c007cac96032 100644
--- a/installation/language/sr-YU/sr-YU.xml
+++ b/installation/language/sr-YU/sr-YU.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <metafile
-	version="3.4"
+	version="3.5"
 	client="installation">
 	<name>Serbian Latin</name>
-	<version>3.4.2</version>
+	<version>3.5.0</version>
 	<creationDate>17-9-2012</creationDate>
 	<author>joomla-serbia.com</author>
  	<copyright>Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved.</copyright>
diff --git a/installation/language/sv-SE/sv-SE.ini b/installation/language/sv-SE/sv-SE.ini
index f8b3b50f8c6d6..6f51e31fb02ac 100644
--- a/installation/language/sv-SE/sv-SE.ini
+++ b/installation/language/sv-SE/sv-SE.ini
@@ -1,7 +1,7 @@
-; Joomla! Swedish Translation version 3.4.0 - 2015-02-19
-; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved.
+; Joomla! Swedish Translation version 3.4.5 - 2015-11-09
+; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
-; Copyright (C) Translation 2005 - 2015 Joomla Sweden Translator Team: Stefan Gagner, Sune Hultman, Olle Zettergeren (www.svenskjoomla.se)
+; Copyright (C) Translation 2005 - 2016 Joomla Sweden Translator Team: Stefan Gagner, Sune Hultman, Olle Zettergeren (www.svenskjoomla.se)
 ; Note : All ini files need to be saved as UTF-8 - No BOM
 
 
@@ -90,7 +90,7 @@ INSTL_SAMPLE_LEARN_SET="Lär dig Joomla engelsk (GB) exempelata"
 INSTL_SAMPLE_TESTING_SET="Test engelsk (GB) exempelata"
 INSTL_SITE_INSTALL_SAMPLE_NONE_DESC="Installera Joomla med endast en meny och loginformulär, utan något innehåll."
 INSTL_SAMPLE_BLOG_SET_DESC="Installera Joomla med endast några få artiklar och bloggrelaterade moduler såsom Gamla inlägg, Bloggroller, Mest lästa inlägg."
-INSTL_SAMPLE_BROCHURE_SET_DESC="Installera Joomla med några få sidor (en meny med sidorna Hem, Om oss, Nyheter, Kontakta oss) och moduler såsom Sök, Egen HTML, Logga in."
+INSTL_SAMPLE_BROCHURE_SET_DESC="Installera Joomla med några få sidor (en meny med sidorna Hem, Om oss, Nyheter, Kontakta oss) och moduler såsom Sök, Egen, Logga in."
 INSTL_SAMPLE_DATA_SET_DESC="Installera Joomla med en sida (en meny med en länk) och moduler såsom Senaste artiklarna, Logga in."
 INSTL_SAMPLE_LEARN_SET_DESC="Installera Joomla med exempelartiklar som beskriver hur Joomla fungerar."
 INSTL_SAMPLE_TESTING_SET_DESC="Installera Joomla med alla typer av menyobjekt för hjälp att prova Joomla."
diff --git a/installation/language/sv-SE/sv-SE.xml b/installation/language/sv-SE/sv-SE.xml
index d31033e55406b..38067f5094544 100644
--- a/installation/language/sv-SE/sv-SE.xml
+++ b/installation/language/sv-SE/sv-SE.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <metafile
-	version="3.4"
+	version="3.5"
 	client="installation">
 	<name>Svenska (SE)</name>
-	<version>3.4.2</version>
+	<version>3.5.0</version>
 	<creationDate>2012-09-19</creationDate>
 	<author>Swedish Translation Team</author>
 	<copyright>Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved.</copyright>
diff --git a/installation/language/ta-IN/ta-IN.ini b/installation/language/ta-IN/ta-IN.ini
index e1228df03e03e..b631c083fc211 100644
--- a/installation/language/ta-IN/ta-IN.ini
+++ b/installation/language/ta-IN/ta-IN.ini
@@ -1,4 +1,4 @@
-; Joomla! Project
+; Joomla! Project
 ; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt
 ; Note : All ini files need to be saved as UTF-8
@@ -89,7 +89,7 @@ INSTL_SAMPLE_LEARN_SET="கற்க Joomla! - ஆங்கிலம்/English
 INSTL_SAMPLE_TESTING_SET="பரிசோதனை - ஆங்கிலம்/English (GB) மாதிரித் தரவு"
 INSTL_SITE_INSTALL_SAMPLE_NONE_DESC="உள்ளடக்கம் இல்லாமல், ஒரு பட்டி மற்றும் புகுபதிகை படிவம் மட்டுமே கொண்ட Joomla!-வை நிறுவுக."
 INSTL_SAMPLE_BLOG_SET_DESC="சில கட்டுரைகள் மற்றும் வலைப்பதிவு தொடர்பான கூறகங்கள் (உ-ம்: சமீபத்தியச் செய்திகள், செய்திச் சுருக்கம், அதிகம் படிக்கப் பெற்ற தகவல்) கொண்ட Joomla!-வை நிறுவுக."
-INSTL_SAMPLE_BROCHURE_SET_DESC="சில பக்கங்கள் (உ-ம்: முகப்பு, எங்களைப் பற்றி, செய்திகள், மற்றும் தொடர்பு கொள்க போன்ற பக்கங்கள் கொண்ட பட்டி) மற்றும் கூறகங்கள் (உ-ம்: தேடுக, தனிப்பயன் HTML, புகுபதிகை படிவம்) கொண்ட Joomla!-வை நிறுவுக."
+INSTL_SAMPLE_BROCHURE_SET_DESC="சில பக்கங்கள் (உ-ம்: முகப்பு, எங்களைப் பற்றி, செய்திகள், மற்றும் தொடர்பு கொள்க போன்ற பக்கங்கள் கொண்ட பட்டி) மற்றும் கூறகங்கள் (உ-ம்: தேடுக, தனிப்பயன், புகுபதிகை படிவம்) கொண்ட Joomla!-வை நிறுவுக."
 INSTL_SAMPLE_DATA_SET_DESC="ஒரு பக்கம் (ஒரு இணைப்பைக் கொண்ட பட்டி) மற்றும் கூறகங்கள் (உ-ம்: சமீபத்தியச் செய்திகள், புகுபதிகை படிவம்) கொண்ட Joomla!-வை நிறுவுக."
 INSTL_SAMPLE_LEARN_SET_DESC="Joomla! எவ்வாறு வேலை செய்கிறது என்பதை விவரிக்கும் எடுத்துக்காட்டுக் கட்டுரைகள் கொண்ட Joomla!-வை நிறுவுக."
 INSTL_SAMPLE_TESTING_SET_DESC="சோதனைக்கு உதவும் வகையில், சாத்தியமான அனைத்து பட்டி உருப்படிகளையும் கொண்ட Joomla!-வை நிறுவுக."
diff --git a/installation/language/ta-IN/ta-IN.xml b/installation/language/ta-IN/ta-IN.xml
index f8dad1e14ac00..8a6d727cd283e 100644
--- a/installation/language/ta-IN/ta-IN.xml
+++ b/installation/language/ta-IN/ta-IN.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <metafile
-	version="3.4"
+	version="3.5"
 	client="installation">
 	<name>Tamil (INDIA)</name>
-	<version>3.4.4</version>
+	<version>3.5.0</version>
 	<creationDate>August 2015</creationDate>
 	<author>Ilagnayeru 'MIG' Manickam, Elango Samy Manim</author>
 	<copyright>Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved.</copyright>
diff --git a/installation/language/tk-TM/tk-TM.ini b/installation/language/tk-TM/tk-TM.ini
index 92b2cdc7586ef..ef2d1125cb061 100644
--- a/installation/language/tk-TM/tk-TM.ini
+++ b/installation/language/tk-TM/tk-TM.ini
@@ -14,7 +14,7 @@ INSTL_STEP_SUMMARY_LABEL="Umumy syn"
 
 ;Language view
 INSTL_SELECT_LANGUAGE_TITLE="Dil Saýlaň"
-INSTL_WARNJAVASCRIPT="Duýduryş! Joomla!-nyň dogry gurnamagy üçin JavaScript açyk bolmaly."
+INSTL_WARNJAVASCRIPT="Duýduryş! Joomla!-nyň dogry gurnamagy üçin JavaScript Administrator tarapynyň doly işleýişi üçin hökman açyk bolmaly."
 INSTL_WARNJSON="Joomla-nyň dogry gurnamagy PHP-de JSON açyk bolmaly."
 
 ;Preinstall view
@@ -87,7 +87,7 @@ INSTL_SAMPLE_LEARN_SET="Learn Joomla English (GB) Nusgalyk Maglumat"
 INSTL_SAMPLE_TESTING_SET="Test English (GB) Nusgalyk Maglumat"
 INSTL_SITE_INSTALL_SAMPLE_NONE_DESC="Joomla-ny kontentsiz diňe bir menýu we giriş formy bilen gurnar."
 INSTL_SAMPLE_BLOG_SET_DESC="Joomla-ny azyjyk makala we blog-a degişli Köne postlar, Köp okalan postlar ýaly modullary gurnar."
-INSTL_SAMPLE_BROCHURE_SET_DESC="Joomla-ny azyjyk sahypalar(Baş menýu, Biz barada, Habarlar we Habarlaşma ) bilen gurnar."
+INSTL_SAMPLE_BROCHURE_SET_DESC="Joomla-ny azyjyk sahypalar(Baş menýu, Biz barada, Habarlar we Habarlaşma ) we Gözleg, Ýörite, Giriş Formy ýaly moduulary bilen gurnar."
 INSTL_SAMPLE_DATA_SET_DESC="Joomla-ny ýeke sahypa we Iň Täze Makalalar, Giriş Formy ýaly modullary gurnar."
 INSTL_SAMPLE_LEARN_SET_DESC="Joomla -nyň işleýişini tanatma üçin edilen mysal berlen makalalary gurnar."
 INSTL_SAMPLE_TESTING_SET_DESC="Joomla-nyň içinde näme bar bolsa ähli menýu we elementler bilen gurnar."
diff --git a/installation/language/tk-TM/tk-TM.xml b/installation/language/tk-TM/tk-TM.xml
index af9adf12495de..2fda13831fd69 100644
--- a/installation/language/tk-TM/tk-TM.xml
+++ b/installation/language/tk-TM/tk-TM.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <metafile
-	version="3.4"
+	version="3.5"
 	client="installation">
-	<name>Turkmen</name>
-	<version>3.4.4</version>
-	<creationDate>August 2015</creationDate>
+	<name>Türkmençe (Türkmenistan)</name>
+	<version>3.5.0</version>
+	<creationDate>November 2015</creationDate>
 	<author>Shohrat Permanov</author>
-	<copyright>Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved.</copyright>
-	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+		<copyright>Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved.</copyright>
+	<license>Joomla! üçin niýetlenen Türkmen dili faýlary.</license>
 	<description></description>
 	<files>
 		<filename>tk-TM.ini</filename>
@@ -18,4 +18,4 @@
 		<rtl>0</rtl>
 	</metadata>
 	<params />
-</metafile>
\ No newline at end of file
+</metafile>
diff --git a/media/mod_languages/images/ga_ie.gif b/media/mod_languages/images/ga_ie.gif
new file mode 100644
index 0000000000000000000000000000000000000000..38a1fc0a892bd993b23510be99afecc2b1f5f261
GIT binary patch
literal 1380
zcmZ?wbhEHb6k_0ExXQrr9|(#W7^gV@Ph(){G5z%O^WVRJm?t|iOm*g;>HW8u>2IUV
zzhXwFDNg^2nHZ<IFidg&2NX$TV43X1I0dN8g?X~`??&0*#VpK|9T}%O{`vF!<IhhF
zJtj<3o%m<^@Xz%8^Y_p1MwvgwEPsm`8G6hFW_o@6@tJ{2K=D6!gl~X?OJYePkhZa}
zC`e4sPAySLN=?tqvsHS(d%u!GW{Ry+xT&v!Z-H}aMy5wqQEG6NUr2IQcCuxPlD(aR
zO@&oOZb5EpNuokUZcbjYRfVlmVoH8esuhq864qBz04piUwpDTjNhpBqbj~kIRWQ{v
z&`mZlGf*%y)H5_TF*i5YQ7|$vG|)FN(l<2HH8i&}HnK7>P=Ep@plwAdX;wilZcw{`
zJX@uVl9B=|ef{$Ca=mh6z5JqdeM3u2OOP2xM!G;1y2X`wC5aWfdBw^w6I@b@lZ!G7
zN;32F6hI~>Cgqow*eU^C3h_d20o>TUVm+{T^pf*)^(zt!^bPe4Kwg3=^!3HBG&dKn
zy0|1L72#g21{a4^7NqJ2r55Lx7A2<wl`Dg+DzI`cN=+=uFAB-e&w+(vKt_H^esM;A
zfr4|ese*4}a%LWg4_5E%Yvq|&T#}fVoa*Ufs{}MbFEca6%GlV@)x^=v)ZEq8$k5Q$
z)WX!w(%I3~+1%LB*wDz(6{goEKe;qFHLnDwHwB^B45waDQpha;+U$~Alv$RV;#QQO
zs{r=0RVHq?7~?b#sy79<TTF23)dxC89~7}j5e*XprXCOzo@{{}c*0N31E%&OV6tZX
z{|}h)e*OIM{oB_spFe&4@c!M~H?Lp4eDVC*(<hG~J$!Kg-rYO5Z{56c{o2(lmoHts
zaQ@ucGpA3TJaPQk(IbZs9Xzmq-`+jDckSG<ecRS8n>TITuzuazHLF*xT(NxF(j|)*
zEnF~v-rPB}XU&{3ecIG1lP67_(BIeF)7{nC(caeD(%jV8P+wPDQ(aYAQC?PBQe0G6
zke`>Elbw~Bk)D>ClAM&75FZyC6CD*95gryA5*!p5;P2<_<L%|?;qK<@;_T$;U~gw@
zV{K(=VQyw>Vr&G=QhK^N+FF_#>T0Sg%1Vj~@^Z2=(o&KV;$osA!a{-q{CvDT++3U-
z>};$o%uI|742nNlz@>~1hy;~)3~Z?fdX_o9Y_MohQBav=Fi*n!=|_!PF0TefBaRA5
z_7(>RkA$ghuGd#{^q+p7QYD+wee&6xJJIEjA4g@?l;u}uH09J4RCUyrcej_c)b~tE
d6cCtD6jP%jEXT{sqNW}xEiS~jO4*UY8URLC-2eap

literal 0
HcmV?d00001


From 75d702c06dcfc7bfa5bb46c442ee3a792929404d Mon Sep 17 00:00:00 2001
From: Brian Teeman <brian@teeman.net>
Date: Tue, 17 Nov 2015 19:36:56 +0000
Subject: [PATCH 089/176] Update links to https

---
 .../templates/hathor/html/mod_menu/default_enabled.php        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/administrator/templates/hathor/html/mod_menu/default_enabled.php b/administrator/templates/hathor/html/mod_menu/default_enabled.php
index 09e0990c96ff1..f893753821707 100644
--- a/administrator/templates/hathor/html/mod_menu/default_enabled.php
+++ b/administrator/templates/hathor/html/mod_menu/default_enabled.php
@@ -337,10 +337,10 @@
 		new JMenuNode(JText::_('MOD_MENU_HELP_COMMUNITY'), 'http://community.joomla.org', 'class:help-community', false, '_blank')
 	);
 	$menu->addChild(
-		new JMenuNode(JText::_('MOD_MENU_HELP_SECURITY'), 'http://developer.joomla.org/security-centre.html', 'class:help-security', false, '_blank')
+		new JMenuNode(JText::_('MOD_MENU_HELP_SECURITY'), 'https://developer.joomla.org/security-centre.html', 'class:help-security', false, '_blank')
 	);
 	$menu->addChild(
-		new JMenuNode(JText::_('MOD_MENU_HELP_DEVELOPER'), 'http://developer.joomla.org', 'class:help-dev', false, '_blank')
+		new JMenuNode(JText::_('MOD_MENU_HELP_DEVELOPER'), 'https://developer.joomla.org', 'class:help-dev', false, '_blank')
 	);
 	$menu->addChild(
 		new JMenuNode(JText::_('MOD_MENU_HELP_XCHANGE'), 'http://joomla.stackexchange.com', 'class:help-dev', false, '_blank')

From 10f2bfd8ca7380dce9d33cc01550bc6dd6cad4b5 Mon Sep 17 00:00:00 2001
From: Brian Teeman <brian@teeman.net>
Date: Tue, 17 Nov 2015 19:37:42 +0000
Subject: [PATCH 090/176] Update default_enabled.php

---
 administrator/modules/mod_menu/tmpl/default_enabled.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/administrator/modules/mod_menu/tmpl/default_enabled.php b/administrator/modules/mod_menu/tmpl/default_enabled.php
index 976052c51ceab..e7267c19a16b6 100644
--- a/administrator/modules/mod_menu/tmpl/default_enabled.php
+++ b/administrator/modules/mod_menu/tmpl/default_enabled.php
@@ -365,9 +365,9 @@
 	$menu->addChild(new JMenuNode(JText::_('MOD_MENU_HELP_RESOURCES'), 'http://resources.joomla.org', 'class:help-jrd', false, '_blank'));
 	$menu->addChild(new JMenuNode(JText::_('MOD_MENU_HELP_COMMUNITY'), 'http://community.joomla.org', 'class:help-community', false, '_blank'));
 	$menu->addChild(
-		new JMenuNode(JText::_('MOD_MENU_HELP_SECURITY'), 'http://developer.joomla.org/security-centre.html', 'class:help-security', false, '_blank')
+		new JMenuNode(JText::_('MOD_MENU_HELP_SECURITY'), 'https://developer.joomla.org/security-centre.html', 'class:help-security', false, '_blank')
 	);
-	$menu->addChild(new JMenuNode(JText::_('MOD_MENU_HELP_DEVELOPER'), 'http://developer.joomla.org', 'class:help-dev', false, '_blank'));
+	$menu->addChild(new JMenuNode(JText::_('MOD_MENU_HELP_DEVELOPER'), 'https://developer.joomla.org', 'class:help-dev', false, '_blank'));
 	$menu->addChild(new JMenuNode(JText::_('MOD_MENU_HELP_XCHANGE'), 'http://joomla.stackexchange.com', 'class:help-dev', false, '_blank'));
 	$menu->addChild(new JMenuNode(JText::_('MOD_MENU_HELP_SHOP'), 'http://shop.joomla.org', 'class:help-shop', false, '_blank'));
 	$menu->getParent();

From 91c01f5de9804e44ed9b5be58c72ec5b38374ccd Mon Sep 17 00:00:00 2001
From: matrikular <kontakt@sven-hurt.de>
Date: Tue, 17 Nov 2015 20:40:02 +0100
Subject: [PATCH 091/176] Remove unnecessary jimport and unused "com_media"
 params

The following changes were made to this file, starting from the top:
- Removed the com_media variable assignment since there seem to be no reference where this was used
- Removed unnecessary jimport for jhtml bootstrap
---
 components/com_contact/views/contact/tmpl/default.php | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/components/com_contact/views/contact/tmpl/default.php b/components/com_contact/views/contact/tmpl/default.php
index ccc562678f939..65611a55eabef 100644
--- a/components/com_contact/views/contact/tmpl/default.php
+++ b/components/com_contact/views/contact/tmpl/default.php
@@ -8,12 +8,8 @@
  */
 
 defined('_JEXEC') or die;
-
-$cparams = JComponentHelper::getParams('com_media');
-
-jimport('joomla.html.html.bootstrap');
 ?>
-<div class="contact<?php echo $this->pageclass_sfx?>">
+<div class="contact<?php echo $this->pageclass_sfx; ?>">
 	<?php if ($this->params->get('show_page_heading')) : ?>
 		<h1>
 			<?php echo $this->escape($this->params->get('page_heading')); ?>

From bfd6c4380244792eb578fbe1090fe391cce44f92 Mon Sep 17 00:00:00 2001
From: matrikular <kontakt@sven-hurt.de>
Date: Tue, 17 Nov 2015 20:57:44 +0100
Subject: [PATCH 092/176] Add component specific renderfield JLayout override

This adds a component specific renderfield JLayout override. The "optional" addition to the label for required fields was moved from the com_contact form layout in here to be able to use the renderField method in the layout file.
---
 .../layouts/joomla/form/renderfield.php       | 41 +++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 components/com_contact/layouts/joomla/form/renderfield.php

diff --git a/components/com_contact/layouts/joomla/form/renderfield.php b/components/com_contact/layouts/joomla/form/renderfield.php
new file mode 100644
index 0000000000000..a0b789ee424a3
--- /dev/null
+++ b/components/com_contact/layouts/joomla/form/renderfield.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2015 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
+ * ---------------------
+ * 	$options         : (array)  Optional parameters
+ * 	$label           : (string) The html code for the label (not required if $options['hiddenLabel'] is true)
+ * 	$input           : (string) The input field html code
+ */
+
+if (!empty($options['showonEnabled']))
+{
+	JHtml::_('jquery.framework');
+	JHtml::_('script', 'jui/cms.js', false, true);
+}
+
+$class = empty($options['class']) ? '' : ' ' . $options['class'];
+$rel   = empty($options['rel']) ? '' : ' ' . $options['rel'];
+?>
+<div class="control-group<?php echo $class; ?>"<?php echo $rel; ?>>
+	<?php if (empty($options['hiddenLabel'])) : ?>
+		<div class="control-label">
+			<?php echo $label; ?>
+			<?php if (strpos($input, 'aria-required="true"') === false && strpos($label, 'spacer-lbl') === false) : ?>
+				<span class="optional"><?php echo JText::_('COM_CONTACT_OPTIONAL'); ?></span>
+			<?php endif; ?>
+		</div>
+	<?php endif; ?>
+	<div class="controls"><?php echo $input; ?></div>
+</div>

From 6b9ca1d15fab288e6143cbe7250900eadd5de0e0 Mon Sep 17 00:00:00 2001
From: matrikular <kontakt@sven-hurt.de>
Date: Tue, 17 Nov 2015 21:02:11 +0100
Subject: [PATCH 093/176] Change contact form fieldset label to match the
 com_users schema

Change contact form fieldset label to match the com_users schema and add component specific "* Requied field" "constant"
---
 language/en-GB/en-GB.com_contact.ini | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/language/en-GB/en-GB.com_contact.ini b/language/en-GB/en-GB.com_contact.ini
index 826042703ec10..ecc50744b34b9 100644
--- a/language/en-GB/en-GB.com_contact.ini
+++ b/language/en-GB/en-GB.com_contact.ini
@@ -3,14 +3,13 @@
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
-
 COM_CONTACT_ADDRESS="Address"
 COM_CONTACT_ARTICLES_HEADING="Contact's articles"
 COM_CONTACT_CAPTCHA_LABEL="Captcha"
 COM_CONTACT_CAPTCHA_DESC="Type in the textbox what you see in the image."
 COM_CONTACT_CAT_NUM="# of Contacts :"
 COM_CONTACT_CONTACT_EMAIL_A_COPY_DESC="Sends a copy of the message to the address you have supplied."
-COM_CONTACT_CONTACT_EMAIL_A_COPY_LABEL="Send Copy to Yourself"
+COM_CONTACT_CONTACT_EMAIL_A_COPY_LABEL="Send copy to yourself"
 COM_CONTACT_CONTACT_EMAIL_NAME_DESC="Your name."
 COM_CONTACT_CONTACT_EMAIL_NAME_LABEL="Name"
 COM_CONTACT_CONTACT_ENTER_MESSAGE_DESC="Enter your message here."
@@ -39,7 +38,7 @@ COM_CONTACT_ENQUIRY_TEXT="This is an enquiry email via %s from:"
 COM_CONTACT_ERROR_CONTACT_NOT_FOUND="Contact not found"
 COM_CONTACT_FAX="Fax"
 COM_CONTACT_FAX_NUMBER="Fax: %s"
-COM_CONTACT_FORM_LABEL="Send an Email. All fields with an asterisk (*) are required."
+COM_CONTACT_CONTACT_DEFAULT_LABEL="Send an Email"
 COM_CONTACT_FORM_NC="Please make sure the form is complete and valid."
 COM_CONTACT_IMAGE_DETAILS="Contact image"
 COM_CONTACT_LINKS="Links"
@@ -49,6 +48,7 @@ COM_CONTACT_MOBILE_NUMBER="Mobile: %s"
 COM_CONTACT_NO_CONTACTS="There are no Contacts to display"
 COM_CONTACT_NOT_MORE_THAN_ONE_EMAIL_ADDRESS="You can't enter more than one email address."
 COM_CONTACT_NUM_ITEMS="Contact Count:"
+COM_CONTACT_CONTACT_REQUIRED="<strong class="_QQ_"red"_QQ_">*</strong> Required field"
 COM_CONTACT_OPTIONAL="(optional)"
 COM_CONTACT_OTHER_INFORMATION="Miscellaneous Information"
 COM_CONTACT_POSITION="Position"

From 202e8386b2a1327f42a01f2a418dd6ea7a5e0596 Mon Sep 17 00:00:00 2001
From: matrikular <kontakt@sven-hurt.de>
Date: Tue, 17 Nov 2015 21:10:20 +0100
Subject: [PATCH 094/176] Add spacer and update fieldset label format to match
 what is used in com_users

Besides reordering the label and description attributes in this file which, to be honest, was more about finding peace and satisfying my OCD, I've changed the fieldset label to match the format that is used in com_users and added a spacer label to output the *Required field hint for the form.
---
 .../com_contact/models/forms/contact.xml      | 48 +++++++++++--------
 1 file changed, 29 insertions(+), 19 deletions(-)

diff --git a/components/com_contact/models/forms/contact.xml b/components/com_contact/models/forms/contact.xml
index 1500d002a6ab1..1ec9116477bee 100644
--- a/components/com_contact/models/forms/contact.xml
+++ b/components/com_contact/models/forms/contact.xml
@@ -1,55 +1,65 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <form>
-	<fieldset name="contact" addrulepath="components/com_contact/models/rules" label="COM_CONTACT_FORM_LABEL">
-		<field name="contact_name"
+	<fieldset name="contact" addrulepath="components/com_contact/models/rules" label="COM_CONTACT_CONTACT_DEFAULT_LABEL">
+		<field
+			name="spacer"
+			type="spacer"
+			label="COM_CONTACT_CONTACT_REQUIRED"
+			class="text"
+		/>
+		<field
+			name="contact_name"
 			type="text"
+			label="COM_CONTACT_CONTACT_EMAIL_NAME_LABEL"
+			description="COM_CONTACT_CONTACT_EMAIL_NAME_DESC"
 			id="contact-name"
 			size="30"
-			description="COM_CONTACT_CONTACT_EMAIL_NAME_DESC"
-			label="COM_CONTACT_CONTACT_EMAIL_NAME_LABEL"
 			filter="string"
 			required="true"
 		/>
-		<field name="contact_email"
+		<field
+			name="contact_email"
 			type="email"
+			label="COM_CONTACT_EMAIL_LABEL"
+			description="COM_CONTACT_EMAIL_DESC"
 			id="contact-email"
 			size="30"
-			description="COM_CONTACT_EMAIL_DESC"
-			label="COM_CONTACT_EMAIL_LABEL"
 			filter="string"
 			validate="contactemail"
-			required="true"
 			autocomplete="email"
+			required="true"
 		/>
-		<field name="contact_subject"
+		<field
+			name="contact_subject"
 			type="text"
+			label="COM_CONTACT_CONTACT_MESSAGE_SUBJECT_LABEL"
+			description="COM_CONTACT_CONTACT_MESSAGE_SUBJECT_DESC"
 			id="contact-emailmsg"
 			size="60"
-			description="COM_CONTACT_CONTACT_MESSAGE_SUBJECT_DESC"
-			label="COM_CONTACT_CONTACT_MESSAGE_SUBJECT_LABEL"
 			filter="string"
 			validate="contactemailsubject"
 			required="true"
 		/>
-		<field name="contact_message"
+		<field
+			name="contact_message"
 			type="textarea"
+			label="COM_CONTACT_CONTACT_ENTER_MESSAGE_LABEL"
+			description="COM_CONTACT_CONTACT_ENTER_MESSAGE_DESC"
 			cols="50"
 			rows="10"
 			id="contact-message"
-			description="COM_CONTACT_CONTACT_ENTER_MESSAGE_DESC"
-			label="COM_CONTACT_CONTACT_ENTER_MESSAGE_LABEL"
 			filter="safehtml"
 			validate="contactemailmessage"
 			required="true"
 		/>
-		<field name="contact_email_copy"
+		<field
+			name="contact_email_copy"
 			type="checkbox"
-			id="contact-email-copy"
-			description="COM_CONTACT_CONTACT_EMAIL_A_COPY_DESC"
 			label="COM_CONTACT_CONTACT_EMAIL_A_COPY_LABEL"
+			description="COM_CONTACT_CONTACT_EMAIL_A_COPY_DESC"
+			id="contact-email-copy"
 			default="0"
 		/>
-
 	</fieldset>
 	<fieldset name="captcha">
 		<field
@@ -61,4 +71,4 @@
 			namespace="contact"
 		/>
 	</fieldset>
-</form>
\ No newline at end of file
+</form>

From ebd0f124f3e41a724a89c46f76e5795a2bc1c51b Mon Sep 17 00:00:00 2001
From: matrikular <kontakt@sven-hurt.de>
Date: Tue, 17 Nov 2015 21:13:57 +0100
Subject: [PATCH 095/176] Remove whitespace in renderField method

---
 libraries/joomla/form/field.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/joomla/form/field.php b/libraries/joomla/form/field.php
index 6fa2b8754a08a..f1223bc0c6943 100644
--- a/libraries/joomla/form/field.php
+++ b/libraries/joomla/form/field.php
@@ -923,9 +923,9 @@ public function renderField($options = array())
 			$options['hiddenLabel'] = true;
 		}
 
-		if ($showon = $this->getAttribute('showon'))
+		if (($showon = $this->getAttribute('showon')))
 		{
-			$showon   = explode(':', $showon, 2);
+			$showon = explode(':', $showon, 2);
 			$options['class'] .= ' showon_' . implode(' showon_', explode(',', $showon[1]));
 			$id = $this->getName($showon[0]);
 			$id = $this->multiple ? str_replace('[]', '', $id) : $id;

From 92467ace89a91115fa42b1e25e975005528ca43e Mon Sep 17 00:00:00 2001
From: matrikular <kontakt@sven-hurt.de>
Date: Tue, 17 Nov 2015 21:16:21 +0100
Subject: [PATCH 096/176] Remove whitespace / blank lines

---
 layouts/joomla/form/field/radio.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/layouts/joomla/form/field/radio.php b/layouts/joomla/form/field/radio.php
index 6962914a5b2b8..904a029332198 100644
--- a/layouts/joomla/form/field/radio.php
+++ b/layouts/joomla/form/field/radio.php
@@ -52,10 +52,8 @@
  *     %4 = any other attributes
  */
 $format = '<input type="radio" id="%1$s" name="%2$s" value="%3$s" %4$s />';
-
-$alt     = preg_replace('/[^a-zA-Z0-9_\-]/', '_', $name);
+$alt    = preg_replace('/[^a-zA-Z0-9_\-]/', '_', $name);
 ?>
-
 <fieldset id="<?php echo $id; ?>" class="<?php echo trim($class . ' radio'); ?>"
 	<?php echo $disabled ? 'disabled' : ''; ?>
 	<?php echo $required ? 'required aria-required="true"' : ''; ?>

From fe6f57ac161a63fed3dcab0f0a5ff5efcacd794d Mon Sep 17 00:00:00 2001
From: matrikular <kontakt@sven-hurt.de>
Date: Tue, 17 Nov 2015 21:20:42 +0100
Subject: [PATCH 097/176] Introduce extract($displayData); to make the
 variables more accessible

These changes allow a more direct access to input, label and the options
---
 layouts/joomla/form/renderfield.php | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/layouts/joomla/form/renderfield.php b/layouts/joomla/form/renderfield.php
index 72a3b76982f71..4e8895b1e0fb1 100644
--- a/layouts/joomla/form/renderfield.php
+++ b/layouts/joomla/form/renderfield.php
@@ -9,6 +9,8 @@
 
 defined('_JEXEC') or die;
 
+extract($displayData);
+
 /**
  * Layout variables
  * ---------------------
@@ -17,19 +19,18 @@
  * 	$input           : (string) The input field html code
  */
 
-if (!empty($displayData['options']['showonEnabled']))
+if (!empty($options['showonEnabled']))
 {
 	JHtml::_('jquery.framework');
 	JHtml::_('script', 'jui/cms.js', false, true);
 }
 
-$class = empty($displayData['options']['class']) ? "" : " " . $displayData['options']['class'];
-$rel   = empty($displayData['options']['rel']) ? "" : " " . $displayData['options']['rel'];
+$class = empty($options['class']) ? '' : ' ' . $options['class'];
+$rel   = empty($options['rel']) ? '' : ' ' . $options['rel'];
 ?>
-
 <div class="control-group<?php echo $class; ?>"<?php echo $rel; ?>>
-	<?php if (empty($displayData['options']['hiddenLabel'])) : ?>
-		<div class="control-label"><?php echo $displayData['label']; ?></div>
+	<?php if (empty($options['hiddenLabel'])) : ?>
+		<div class="control-label"><?php echo $label; ?></div>
 	<?php endif; ?>
-	<div class="controls"><?php echo $displayData['input']; ?></div>
+	<div class="controls"><?php echo $input; ?></div>
 </div>

From e624050d75137b530ad47bab963dc01b69205634 Mon Sep 17 00:00:00 2001
From: matrikular <kontakt@sven-hurt.de>
Date: Tue, 17 Nov 2015 21:22:57 +0100
Subject: [PATCH 098/176] Introduce extract($displayData); to make the
 variables more accessible

As well es for the renderfield.php the proposed changes allow a more direct access the the variables used in this file
---
 layouts/joomla/form/renderlabel.php | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/layouts/joomla/form/renderlabel.php b/layouts/joomla/form/renderlabel.php
index 0520c9f481a9e..730337c2ae5c4 100644
--- a/layouts/joomla/form/renderlabel.php
+++ b/layouts/joomla/form/renderlabel.php
@@ -9,6 +9,8 @@
 
 defined('_JEXEC') or die;
 
+extract($displayData);
+
 /**
  * Layout variables
  * ---------------------
@@ -20,31 +22,24 @@
  * 	$position     : (string)  The tooltip position. Bottom for alias
  */
 
-$text     = $displayData['text'];
-$desc     = $displayData['description'];
-$for      = $displayData['for'];
-$req      = $displayData['required'];
-$classes  = array_filter((array) $displayData['classes']);
-$position = $displayData['position'];
+$classes = array_filter((array) $classes);
 
 $id = $for . '-lbl';
 $title = '';
 
-// If a description is specified, use it to build a tooltip.
-if (!empty($desc))
+if (!empty($description))
 {
 	JHtml::_('bootstrap.tooltip');
 	$classes[] = 'hasTooltip';
-	$title     = ' title="' . JHtml::tooltipText(trim($text, ':'), $desc, 0) . '"';
+	$title     = ' title="' . JHtml::tooltipText(trim($text, ':'), $description, 0) . '"';
 }
 
-// If required, there's a class for that.
-if ($req)
+if ($required)
 {
 	$classes[] = 'required';
 }
 
 ?>
 <label id="<?php echo $id; ?>" for="<?php echo $for; ?>" class="<?php echo implode(' ', $classes); ?>"<?php echo $title; ?><?php echo $position; ?>>
-	<?php echo $text; ?><?php if ($req) : ?><span class="star">&#160;*</span><?php endif; ?>
-</label>
\ No newline at end of file
+	<?php echo $text; ?><?php if ($required) : ?><span class="star">&#160;*</span><?php endif; ?>
+</label>

From 6688f00a201be91224546794b12080158a75007d Mon Sep 17 00:00:00 2001
From: Brian Teeman <brian@teeman.net>
Date: Tue, 17 Nov 2015 21:16:14 +0000
Subject: [PATCH 099/176] Update en-GB.com_users.ini

---
 administrator/language/en-GB/en-GB.com_users.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/administrator/language/en-GB/en-GB.com_users.ini b/administrator/language/en-GB/en-GB.com_users.ini
index 2a89adb4d15d8..8b804bd48b238 100644
--- a/administrator/language/en-GB/en-GB.com_users.ini
+++ b/administrator/language/en-GB/en-GB.com_users.ini
@@ -155,7 +155,7 @@ COM_USERS_MAIL_FIELD_MESSAGE_DESC="Enter a default message."
 COM_USERS_MAIL_FIELD_MESSAGE_LABEL="Message"
 COM_USERS_MAIL_FIELD_RECURSE_DESC="If checked, the email will also be sent to users who are members of any child groups of the selected groups."
 COM_USERS_MAIL_FIELD_RECURSE_LABEL="Mail to Child User Groups"
-COM_USERS_MAIL_FIELD_SEND_AS_BLIND_CARBON_COPY_DESC="Hides recipient list and adds copy to site email."
+COM_USERS_MAIL_FIELD_SEND_AS_BLIND_CARBON_COPY_DESC="Hides the recipient list and use the site email address for the To: field."
 COM_USERS_MAIL_FIELD_SEND_AS_BLIND_CARBON_COPY_LABEL="Recipients as BCC"
 COM_USERS_MAIL_FIELD_SEND_IN_HTML_MODE_DESC="If checked, the email will be sent with HTML tags. If not checked, email will be sent in plain text."
 COM_USERS_MAIL_FIELD_SEND_IN_HTML_MODE_LABEL="Send in HTML Mode"

From 87c52783ffbb11fffe8d313cf328d3d756d78e81 Mon Sep 17 00:00:00 2001
From: Brian Teeman <brian@teeman.net>
Date: Tue, 17 Nov 2015 21:18:53 +0000
Subject: [PATCH 100/176] Update en-GB.com_users.ini

---
 administrator/language/en-GB/en-GB.com_users.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/administrator/language/en-GB/en-GB.com_users.ini b/administrator/language/en-GB/en-GB.com_users.ini
index 8b804bd48b238..c4eeab1db4b37 100644
--- a/administrator/language/en-GB/en-GB.com_users.ini
+++ b/administrator/language/en-GB/en-GB.com_users.ini
@@ -155,7 +155,7 @@ COM_USERS_MAIL_FIELD_MESSAGE_DESC="Enter a default message."
 COM_USERS_MAIL_FIELD_MESSAGE_LABEL="Message"
 COM_USERS_MAIL_FIELD_RECURSE_DESC="If checked, the email will also be sent to users who are members of any child groups of the selected groups."
 COM_USERS_MAIL_FIELD_RECURSE_LABEL="Mail to Child User Groups"
-COM_USERS_MAIL_FIELD_SEND_AS_BLIND_CARBON_COPY_DESC="Hides the recipient list and use the site email address for the To: field."
+COM_USERS_MAIL_FIELD_SEND_AS_BLIND_CARBON_COPY_DESC="Hide the recipient list and use the site email address for the To: field."
 COM_USERS_MAIL_FIELD_SEND_AS_BLIND_CARBON_COPY_LABEL="Recipients as BCC"
 COM_USERS_MAIL_FIELD_SEND_IN_HTML_MODE_DESC="If checked, the email will be sent with HTML tags. If not checked, email will be sent in plain text."
 COM_USERS_MAIL_FIELD_SEND_IN_HTML_MODE_LABEL="Send in HTML Mode"

From e119c7f581b183f5293e61848de5d184fba8c64d Mon Sep 17 00:00:00 2001
From: matrikular <kontakt@sven-hurt.de>
Date: Tue, 17 Nov 2015 23:19:33 +0100
Subject: [PATCH 101/176] Add whitespace to fieldset

---
 components/com_contact/views/contact/tmpl/default_form.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/com_contact/views/contact/tmpl/default_form.php b/components/com_contact/views/contact/tmpl/default_form.php
index 93a817fa454b3..7cc18157c1039 100644
--- a/components/com_contact/views/contact/tmpl/default_form.php
+++ b/components/com_contact/views/contact/tmpl/default_form.php
@@ -16,7 +16,7 @@
 ?>
 <div class="contact-form">
 	<form id="contact-form" action="<?php echo JRoute::_('index.php'); ?>" method="post" class="form-validate form-horizontal well">
-		<?php foreach ($this->form->getFieldsets() as $fieldset): ?>
+		<?php foreach ($this->form->getFieldsets() as $fieldset) : ?>
 			<?php $fields = $this->form->getFieldset($fieldset->name); ?>
 			<?php if (count($fields)) : ?>
 				<fieldset>

From b6cc86c410dab911cce3f702ff91106fe58a561c Mon Sep 17 00:00:00 2001
From: Thomas Hunziker <werbemails@bakual.ch>
Date: Wed, 18 Nov 2015 09:44:51 +0100
Subject: [PATCH 102/176] Fixed installation language xml for tk-TM

---
 installation/language/tk-TM/tk-TM.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/installation/language/tk-TM/tk-TM.xml b/installation/language/tk-TM/tk-TM.xml
index 2fda13831fd69..450d2b252b3bc 100644
--- a/installation/language/tk-TM/tk-TM.xml
+++ b/installation/language/tk-TM/tk-TM.xml
@@ -6,8 +6,8 @@
 	<version>3.5.0</version>
 	<creationDate>November 2015</creationDate>
 	<author>Shohrat Permanov</author>
-		<copyright>Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved.</copyright>
-	<license>Joomla! üçin niýetlenen Türkmen dili faýlary.</license>
+	<copyright>Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<description></description>
 	<files>
 		<filename>tk-TM.ini</filename>

From d73db73e34b2ae0aadf522a3a0490b379a6d0c18 Mon Sep 17 00:00:00 2001
From: Brian Teeman <brian@teeman.net>
Date: Wed, 18 Nov 2015 10:26:21 +0000
Subject: [PATCH 103/176] remove wrap

---
 .../components/com_users/views/debuggroup/tmpl/default.php  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/administrator/components/com_users/views/debuggroup/tmpl/default.php b/administrator/components/com_users/views/debuggroup/tmpl/default.php
index ed2cbe42b16c7..5ea0741ea4ad9 100644
--- a/administrator/components/com_users/views/debuggroup/tmpl/default.php
+++ b/administrator/components/com_users/views/debuggroup/tmpl/default.php
@@ -48,14 +48,14 @@
 						<?php echo JHtml::_('grid.sort', 'COM_USERS_HEADING_ASSET_NAME', 'a.name', $listDirn, $listOrder); ?>
 					</th>
 					<?php foreach ($this->actions as $key => $action) : ?>
-					<th width="5%" class="nowrap center">
+					<th width="5%" class="center">
 						<span class="hasTooltip" title="<?php echo JHtml::tooltipText($key, $action[1]); ?>"><?php echo JText::_($key); ?></span>
 					</th>
 					<?php endforeach; ?>
-					<th width="5%" class="nowrap center">
+					<th width="5%" class="center">
 						<?php echo JHtml::_('grid.sort', 'COM_USERS_HEADING_LFT', 'a.lft', $listDirn, $listOrder); ?>
 					</th>
-					<th width="1%" class="nowrap center">
+					<th width="1%" class="center">
 						<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_ID', 'a.id', $listDirn, $listOrder); ?>
 					</th>
 				</tr>

From d215d3a58780388fe62eab5270d5b244cc1628f2 Mon Sep 17 00:00:00 2001
From: Brian Teeman <brian@teeman.net>
Date: Wed, 18 Nov 2015 10:38:48 +0000
Subject: [PATCH 104/176] remove nowrap

---
 .../components/com_users/views/debuggroup/tmpl/default.php  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/administrator/components/com_users/views/debuggroup/tmpl/default.php b/administrator/components/com_users/views/debuggroup/tmpl/default.php
index ed2cbe42b16c7..5ea0741ea4ad9 100644
--- a/administrator/components/com_users/views/debuggroup/tmpl/default.php
+++ b/administrator/components/com_users/views/debuggroup/tmpl/default.php
@@ -48,14 +48,14 @@
 						<?php echo JHtml::_('grid.sort', 'COM_USERS_HEADING_ASSET_NAME', 'a.name', $listDirn, $listOrder); ?>
 					</th>
 					<?php foreach ($this->actions as $key => $action) : ?>
-					<th width="5%" class="nowrap center">
+					<th width="5%" class="center">
 						<span class="hasTooltip" title="<?php echo JHtml::tooltipText($key, $action[1]); ?>"><?php echo JText::_($key); ?></span>
 					</th>
 					<?php endforeach; ?>
-					<th width="5%" class="nowrap center">
+					<th width="5%" class="center">
 						<?php echo JHtml::_('grid.sort', 'COM_USERS_HEADING_LFT', 'a.lft', $listDirn, $listOrder); ?>
 					</th>
-					<th width="1%" class="nowrap center">
+					<th width="1%" class="center">
 						<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_ID', 'a.id', $listDirn, $listOrder); ?>
 					</th>
 				</tr>

From e91704a4e7c12985c0b323075194bdf52039ddd4 Mon Sep 17 00:00:00 2001
From: George Wilson <georgejameswilson@googlemail.com>
Date: Wed, 18 Nov 2015 11:04:19 +0000
Subject: [PATCH 105/176] Revert d73db73e34b2ae0aadf522a3a0490b379a6d0c18

This commit was accidently made and will be made as a Pull Request
---
 .../components/com_users/views/debuggroup/tmpl/default.php  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/administrator/components/com_users/views/debuggroup/tmpl/default.php b/administrator/components/com_users/views/debuggroup/tmpl/default.php
index 5ea0741ea4ad9..ed2cbe42b16c7 100644
--- a/administrator/components/com_users/views/debuggroup/tmpl/default.php
+++ b/administrator/components/com_users/views/debuggroup/tmpl/default.php
@@ -48,14 +48,14 @@
 						<?php echo JHtml::_('grid.sort', 'COM_USERS_HEADING_ASSET_NAME', 'a.name', $listDirn, $listOrder); ?>
 					</th>
 					<?php foreach ($this->actions as $key => $action) : ?>
-					<th width="5%" class="center">
+					<th width="5%" class="nowrap center">
 						<span class="hasTooltip" title="<?php echo JHtml::tooltipText($key, $action[1]); ?>"><?php echo JText::_($key); ?></span>
 					</th>
 					<?php endforeach; ?>
-					<th width="5%" class="center">
+					<th width="5%" class="nowrap center">
 						<?php echo JHtml::_('grid.sort', 'COM_USERS_HEADING_LFT', 'a.lft', $listDirn, $listOrder); ?>
 					</th>
-					<th width="1%" class="center">
+					<th width="1%" class="nowrap center">
 						<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_ID', 'a.id', $listDirn, $listOrder); ?>
 					</th>
 				</tr>

From 5bcdfcca4e9bac8b75b86bfe6adee06157163488 Mon Sep 17 00:00:00 2001
From: Robert Deutz <rdeutz@googlemail.com>
Date: Wed, 18 Nov 2015 15:01:11 +0100
Subject: [PATCH 106/176] Removed not useful tests

Unit test should test the interface of a class and not the internals. In this case the getInput Method is tested and this is a protected method. Further more the tests are very basic, they check if properties are set. For the tests reflection and mocking is havily used so it is more a test if reflection works as testing the class. On top the test fails often because now is used and compared later, if this happens at the wrong millsecond the time is different and the test fails.
---
 .../form/fields/JFormFieldCalendarTest.php    | 572 ------------------
 1 file changed, 572 deletions(-)
 delete mode 100644 tests/unit/suites/libraries/joomla/form/fields/JFormFieldCalendarTest.php

diff --git a/tests/unit/suites/libraries/joomla/form/fields/JFormFieldCalendarTest.php b/tests/unit/suites/libraries/joomla/form/fields/JFormFieldCalendarTest.php
deleted file mode 100644
index 0f481843aba6a..0000000000000
--- a/tests/unit/suites/libraries/joomla/form/fields/JFormFieldCalendarTest.php
+++ /dev/null
@@ -1,572 +0,0 @@
-<?php
-/**
- * @package     Joomla.UnitTest
- * @subpackage  Form
- *
- * @copyright   Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE
- */
-
-JFormHelper::loadFieldClass('calendar');
-
-/**
- * Test class for JForm.
- *
- * @package     Joomla.UnitTest
- * @subpackage  Form
- * @since       11.1
- */
-class JFormFieldCalendarTest extends TestCaseDatabase
-{
-	/**
-	 * Backup of the SERVER superglobal
-	 *
-	 * @var    array
-	 * @since  3.1
-	 */
-	protected $backupServer;
-
-	/**
-	 * Sets up the fixture, for example, opens a network connection.
-	 * This method is called before a test is executed.
-	 *
-	 * @return  void
-	 *
-	 * @since   3.1
-	 */
-	protected function setUp()
-	{
-		parent::setUp();
-
-		$this->saveFactoryState();
-
-		JFactory::$application = $this->getMockCmsApp();
-		JFactory::$config      = $this->getMockConfig();
-		JFactory::$document    = $this->getMockDocument();
-		JFactory::$language    = $this->getMockLanguage();
-		JFactory::$session     = $this->getMockSession();
-
-		$this->backupServer = $_SERVER;
-
-		$_SERVER['HTTP_HOST'] = 'example.com';
-		$_SERVER['SCRIPT_NAME'] = '';
-	}
-
-	/**
-	 * Tears down the fixture, for example, closes a network connection.
-	 * This method is called after a test is executed.
-	 *
-	 * @return  void
-	 *
-	 * @since   3.1
-	 */
-	protected function tearDown()
-	{
-		$_SERVER = $this->backupServer;
-
-		$this->restoreFactoryState();
-
-		parent::tearDown();
-	}
-
-	/**
-	 * Test...
-	 *
-	 * @return array
-	 */
-	public function getSetupData()
-	{
-		return array(
-			/*
-			 * Test normal parameters
-			 */
-			'normal' => array(
-				array(
-					'name' => 'myCalendarElement',
-					'id' => 'myCalendarId',
-					'format' => '%m-%Y-%d',
-					'maxlength' => '45',
-					'filter' => 'SERVER_UTC',
-				),
-				array(
-					'name' => 'myCalendarElement',
-					'id' => 'myCalendarId',
-					'format' => '%m-%Y-%d',
-					'maxlength' => 45,
-					'filter' => 'SERVER_UTC',
-				),
-			),
-
-			/*
-			 * Non integer size
-			 */
-			'nonintsize' => array(
-				array(
-					'name' => 'myCalendarElement',
-					'id' => 'myCalendarId',
-					'maxlength' => 'thirty five foo',
-				),
-				array(
-					'name' => 'myCalendarElement',
-					'id' => 'myCalendarId',
-					'maxlength' => 45,
-				),
-			),
-
-			/*
-			 * No format provided
-			 */
-			'noformat' => array(
-				array(
-					'name' => 'myCalendarElement',
-					'id' => 'myCalendarId',
-				),
-				array(
-					'name' => 'myCalendarElement',
-					'id' => 'myCalendarId',
-					'format' => '%Y-%m-%d',
-				),
-			),
-
-			/*
-			* No filter provided
-			*/
-			'nofilter' => array(
-				array(
-					'name' => 'myCalendarElement',
-					'id' => 'myCalendarId',
-				),
-				array(
-					'name' => 'myCalendarElement',
-					'id' => 'myCalendarId',
-					'filter' => 'USER_UTC',
-				),
-			),
-		);
-	}
-
-	/**
-	 * Test...
-	 *
-	 * @return array
-	 */
-	public function getInputAttributeData()
-	{
-		return array(
-			/*
-			* Test normal parameters
-			*/
-			'normal' => array(
-				array(
-					'name' => 'myCalendarElement',
-					'id' => 'myCalendarId',
-					'value' => 'myValue',
-					'format' => '%m-%Y-%d',
-					'size' => 25,
-					'maxlength' => 45,
-					'class' => 'myClass',
-					'readonly' => true,
-					'disabled' => false,
-					'onchange' => '',
-					'filter' => '',
-				),
-				array(
-					'myValue',
-					'myCalendarElement',
-					'myCalendarId',
-					'%m-%Y-%d',
-					array(
-						'size' => 25,
-						'maxlength' => 45,
-						'class' => 'myClass',
-						'readonly' => 'readonly',
-					)
-				)
-			),
-
-			/*
-			 * value = 'NOW'
-			 */
-			'value_is_now' => array(
-				array(
-					'name' => 'myCalendarElement',
-					'id' => 'myCalendarId',
-					'value' => 'NOW',
-					'format' => 'Y-m-d',
-					'size' => 25,
-					'maxlength' => 45,
-					'disabled' => true,
-					'onchange' => 'This is my onchange value',
-					'filter' => '',
-				),
-				array(
-					'strftime(\'%Y-%m-%d\')',
-					'myCalendarElement',
-					'myCalendarId',
-					'Y-m-d',
-					array(
-						'size' => 25,
-						'maxlength' => 45,
-						'disabled' => 'disabled',
-						'onchange' => 'This is my onchange value',
-					)
-				)
-			)
-		);
-	}
-
-	/**
-	 * Tests various attribute methods - this method does not handle filters
-	 *
-	 * @param   array  $element         @todo
-	 * @param   array  $expectedResult  @todo
-	 *
-	 * @dataProvider getSetupData
-	 *
-	 * @return void
-	 */
-	/*public function testSetup($element, $expectedResult)
-	{
-		require_once JPATH_PLATFORM . '/joomla/form/fields/calendar.php';
-
-		$elementStr = '';
-
-		$userObject = new JUser;
-
-		foreach ($element as $attr => $value)
-		{
-			$elementStr .= ' ' . $attr . '="' . $value . '"';
-		}
-
-		$element = '<field type="calendar" ' . $elementStr . " />";
-
-		$field = new JFormFieldCalendar;
-		$element = simplexml_load_string($element);
-
-		$this->assertThat(
-			$field->setup($element, ''),
-			$this->isTrue(),
-			'Line:' . __LINE__ . ' The setup method should return true if successful.'
-		);
-
-		foreach ($expectedResult as $property => $value)
-		{
-			$this->assertThat(
-				$field->$property,
-				$this->equalTo($value),
-				'Line:' . __LINE__ . ' The property ' . $property . ' should be computed from the XML.'
-			);
-		}
-	}*/
-
-	/**
-	 * Tests various attribute methods - this method does not handle filters
-	 *
-	 * @param   array   $element             @todo
-	 * @param   string  $expectedParameters  @todo
-	 *
-	 * @dataProvider getInputAttributeData
-	 *
-	 * @return void
-	 */
-	public function testGetInputAttributes($element, $expectedParameters)
-	{
-		// We create stubs for config and session/user objects
-		$config = new JObject;
-
-		// Put the stub in place
-		JFactory::$config = $config;
-		$sessionMock = $this->getMock('sessionMock', array('get'));
-
-		$userObject = new JUser;
-
-		$sessionMock->expects($this->any())
-			->method('get')
-			->with('user')
-			->will($this->returnValue($userObject));
-
-		// Put the stub in place
-		JFactory::$session = $sessionMock;
-
-		// Instantiate the calendar field
-		$calendar = new JFormFieldCalendar;
-
-		if ($expectedParameters[0] == 'strftime(\'%Y-%m-%d\')')
-		{
-			date_default_timezone_set('UTC');
-			$expectedParameters[0] = strftime('%Y-%m-%d %H:%M:%S');
-		}
-
-		// Setup our values from our data set
-		foreach ($element as $attr => $value)
-		{
-			TestReflection::setValue($calendar, $attr, $value);
-		}
-
-		// Create the mock to implant into JHtml so that we can check our values
-		$mock = $this->getMock('calendarHandler', array('calendar'));
-
-		// Setup the expectation with the values from the dataset
-		$mock->expects($this->once())
-			->method('calendar')
-			->with($expectedParameters[0], $expectedParameters[1], $expectedParameters[2], $expectedParameters[3], $expectedParameters[4]);
-
-		// Register our mock with JHtml
-		JHtml::register('calendar', array($mock, 'calendar'));
-
-		// Invoke our method
-		TestReflection::invoke($calendar, 'getInput');
-
-		// Unregister the mock
-		JHtml::unregister('jhtml..calendar');
-	}
-
-	/**
-	 * Test...
-	 *
-	 * @return void
-	 */
-	public function testGetInputServer_Utc()
-	{
-		// Create a stub JConfig
-		$config = new JObject;
-
-		// Put the stub in place
-		JFactory::$config = $config;
-		$sessionMock = $this->getMock('sessionMock', array('get'));
-
-		$userObject = new JUser;
-
-		$sessionMock->expects($this->any())
-			->method('get')
-			->with('user')
-			->will($this->returnValue($userObject));
-
-		// Put the stub in place
-		JFactory::$session = $sessionMock;
-
-		// Instantiate the calendar field
-		$calendar = new JFormFieldCalendar;
-
-		// Setup our values from our data set
-		TestReflection::setValue($calendar, 'id', 'myElementId');
-		TestReflection::setValue($calendar, 'name', 'myElementName');
-		TestReflection::setValue($calendar, 'format', '%m-%Y-%d');
-		TestReflection::setValue($calendar, 'size', 25);
-		TestReflection::setValue($calendar, 'maxlength', 45);
-		TestReflection::setValue($calendar, 'class', 'myClass');
-		TestReflection::setValue($calendar, 'readonly', true);
-		TestReflection::setValue($calendar, 'disabled', false);
-		TestReflection::setValue($calendar, 'onchange', '');
-		TestReflection::setValue($calendar, 'filter', 'SERVER_UTC');
-
-		// 1269442718
-		TestReflection::setValue($calendar, 'value', 1269442718);
-
-		// -5
-		$config->set('offset', 'US/Eastern');
-
-		// -3
-		$userObject->setParam('timezone', 'America/Buenos_Aires');
-
-		// Create the mock to implant into JHtml so that we can check our values
-		$mock = $this->getMock('calendarHandler', array('calendar'));
-
-		// Setup the expectation with the values from the dataset
-		$mock->expects($this->once())
-			->method('calendar')
-			->with('2010-03-24 10:58:38', 'myElementName', 'myElementId', '%m-%Y-%d',
-			array(
-				'size' => 25,
-				'maxlength' => 45,
-				'class' => 'myClass',
-				'readonly' => 'readonly'
-			)
-		);
-
-		// Register our mock with JHtml
-		JHtml::register('calendar', array($mock, 'calendar'));
-
-		// Invoke our method
-		TestReflection::invoke($calendar, 'getInput');
-
-		// Unregister the mock
-		JHtml::unregister('jhtml..calendar');
-	}
-
-	/**
-	 * Test...
-	 *
-	 * @return void
-	 */
-	public function testGetInputUser_Utc()
-	{
-		// Create a stub JConfig
-		$config = new JObject;
-
-		// Put the stub in place
-		JFactory::$config = $config;
-		$sessionMock = $this->getMock('sessionMock', array('get'));
-
-		$userObject = new JUser;
-
-		$sessionMock->expects($this->any())
-			->method('get')
-			->with('user')
-			->will($this->returnValue($userObject));
-
-		// Put the stub in place
-		JFactory::$session = $sessionMock;
-
-		// Instantiate the calendar field
-		$calendar = new JFormFieldCalendar;
-
-		// Setup our values from our data set
-		TestReflection::setValue($calendar, 'id', 'myElementId');
-		TestReflection::setValue($calendar, 'name', 'myElementName');
-		TestReflection::setValue($calendar, 'format', '%m-%Y-%d');
-		TestReflection::setValue($calendar, 'size', 25);
-		TestReflection::setValue($calendar, 'maxlength', 45);
-		TestReflection::setValue($calendar, 'class', 'myClass');
-		TestReflection::setValue($calendar, 'readonly', true);
-		TestReflection::setValue($calendar, 'disabled', false);
-		TestReflection::setValue($calendar, 'onchange', '');
-		TestReflection::setValue($calendar, 'filter', 'USER_UTC');
-
-		// 1269442718
-		TestReflection::setValue($calendar, 'value', 1269442718);
-
-		// +4
-		$config->set('offset', 'Asia/Muscat');
-
-		// We don't set the user param to see if it properly falls back to the server time (as it should)
-
-		// Create the mock to implant into JHtml so that we can check our values
-		$mock = $this->getMock('calendarHandler', array('calendar'));
-
-		// Setup the expectation with the values from the dataset
-		$mock->expects($this->once())
-			->method('calendar')
-			->with('2010-03-24 18:58:38', 'myElementName', 'myElementId', '%m-%Y-%d',
-			array(
-				'size' => 25,
-				'maxlength' => 45,
-				'class' => 'myClass',
-				'readonly' => 'readonly'
-			)
-		);
-
-		// Register our mock with JHtml
-		JHtml::register('calendar', array($mock, 'calendar'));
-
-		// Invoke our method
-		TestReflection::invoke($calendar, 'getInput');
-
-		// Unregister the mock
-		JHtml::unregister('jhtml..calendar');
-
-		// Create the mock to implant into JHtml so that we can check our values
-		$mock2 = $this->getMock('calendarHandler', array('calendar'));
-
-		// Setup the expectation with the values from the dataset
-		$mock2->expects($this->once())
-			->method('calendar')
-			->with('2010-03-24 22:58:38', 'myElementName', 'myElementId', '%m-%Y-%d',
-			array(
-				'size' => 25,
-				'maxlength' => 45,
-				'class' => 'myClass',
-				'readonly' => 'readonly'
-			)
-		);
-
-		// -5
-		$config->set('offset', 'US/Eastern');
-
-		// +4		// now we set the user param to test it out.
-		$userObject->setParam('timezone', 'Asia/Muscat');
-
-		// Register our mock with JHtml
-		JHtml::register('calendar', array($mock2, 'calendar'));
-
-		// Invoke our method
-		TestReflection::invoke($calendar, 'getInput');
-
-		// Unregister the mock
-		JHtml::unregister('jhtml..calendar');
-	}
-
-	/**
-	 * Test the getInput method.
-	 *
-	 * @return void
-	 */
-	public function testGetInputWithNullDatabase()
-	{
-		$form = new JForm('form1');
-
-		$this->assertThat(
-			$form->load('<form><field name="calendar" type="calendar" /></form>'),
-			$this->isTrue(),
-			'Line:' . __LINE__ . ' XML string should load successfully.'
-		);
-
-		$field = new JFormFieldCalendar($form);
-
-		$this->assertThat(
-			$field->setup($form->getXml()->field, '0000-00-00 00:00:00'),
-			$this->isTrue(),
-			'Line:' . __LINE__ . ' The setup method should return true.'
-		);
-
-		$this->assertThat(
-			strlen($field->input),
-			$this->greaterThan(0),
-			'Line:' . __LINE__ . ' The getInput method should return something without error.'
-		);
-
-		// TODO: Should check all the attributes have come in properly.
-	}
-
-	/**
-	 * Test the getInput method.
-	 *
-	 * @return void
-	 */
-	public function testGetInputWithStringValue()
-	{
-		$form = new JForm('form1');
-
-		$this->assertThat(
-			$form->load('<form><field name="calendar" type="calendar" /></form>'),
-			$this->isTrue(),
-			'Line:' . __LINE__ . ' XML string should load successfully.'
-		);
-
-		// The calendar form field depends on having the time zone available. Easiest way is to
-		// mock it in the config
-		$testConfig = $this->getMockConfig();
-		$testConfig->expects(
-			$this->any()
-		)
-			->method('get')
-			->will($this->returnValue('Europe/London'));
-		JFactory::$config = $testConfig;
-
-		$field = new JFormFieldCalendar($form);
-
-		$this->assertThat(
-			$field->setup($form->getXml()->field, 'June 2015'),
-			$this->isTrue(),
-			'Line:' . __LINE__ . ' The setup method should return true.'
-		);
-
-		$this->assertThat(
-			strlen($field->input),
-			$this->greaterThan(0),
-			'Line:' . __LINE__ . ' The getInput method should return something without error.'
-		);
-
-		// TODO: Should check all the attributes have come in properly.
-	}
-}

From b710fed86e6d151d3884938e4c80008372b98e74 Mon Sep 17 00:00:00 2001
From: Thomas Hunziker <werbemails@bakual.ch>
Date: Wed, 18 Nov 2015 15:32:14 +0100
Subject: [PATCH 107/176] Adding irish (ga) translation to TinyMCE

---
 media/editors/tinymce/langs/ga.js | 219 ++++++++++++++++++++++++++++++
 1 file changed, 219 insertions(+)
 create mode 100644 media/editors/tinymce/langs/ga.js

diff --git a/media/editors/tinymce/langs/ga.js b/media/editors/tinymce/langs/ga.js
new file mode 100644
index 0000000000000..709643ef9e865
--- /dev/null
+++ b/media/editors/tinymce/langs/ga.js
@@ -0,0 +1,219 @@
+tinymce.addI18n('ga',{
+"Cut": "Gearr",
+"Heading 5": "Ceannteideal 5",
+"Header 2": "Ceannt\u00e1sc 2",
+"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "N\u00ed f\u00e9idir le do bhrabhs\u00e1la\u00ed teacht go d\u00edreach ar an ngearrthaisce. Bain \u00fas\u00e1id as na haicearra\u00ed Ctrl+X\/C\/V. ",
+"Heading 4": "Ceannteideal 4",
+"Div": "Deighilt",
+"Heading 2": "Ceannteideal 2",
+"Paste": "Greamaigh",
+"Close": "D\u00fan",
+"Font Family": "Cl\u00f3fhoireann",
+"Pre": "R\u00e9amh",
+"Align right": "Ail\u00ednigh ar dheis",
+"New document": "C\u00e1ip\u00e9is nua",
+"Blockquote": "Athfhriotal",
+"Numbered list": "Liosta Uimhrithe",
+"Heading 1": "Ceannteideal 1",
+"Headings": "Ceannteidil",
+"Increase indent": "M\u00e9adaigh eang",
+"Formats": "Form\u00e1id\u00ed",
+"Headers": "Ceannt\u00e1sca",
+"Select all": "Roghnaigh uile",
+"Header 3": "Ceannt\u00e1sc 3",
+"Blocks": "Blocanna",
+"Undo": "Cealaigh",
+"Strikethrough": "L\u00edne tr\u00edd",
+"Bullet list": "Liosta Urchar",
+"Header 1": "Ceannt\u00e1sc 1",
+"Superscript": "Forscript",
+"Clear formatting": "Glan form\u00e1idi\u00fa",
+"Font Sizes": "Cl\u00f3mh\u00e9ideanna",
+"Subscript": "Foscript",
+"Header 6": "Ceannt\u00e1sc 6",
+"Redo": "Athdh\u00e9an",
+"Paragraph": "Alt",
+"Ok": "OK",
+"Bold": "Trom",
+"Code": "C\u00f3d",
+"Italic": "Iod\u00e1lach",
+"Align center": "Ail\u00ednigh sa l\u00e1r",
+"Header 5": "Ceannt\u00e1sc 5",
+"Heading 6": "Ceannteideal 6",
+"Heading 3": "Ceannteideal 3",
+"Decrease indent": "Laghdaigh eang",
+"Header 4": "Ceannt\u00e1sc 4",
+"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Sa m\u00f3d gn\u00e1th-th\u00e9acs anois. Gream\u00f3far \u00e1bhar mar ghn\u00e1th-th\u00e9acs go dt\u00ed go m\u00fachfaidh t\u00fa an rogha seo.",
+"Underline": "Fol\u00edne",
+"Cancel": "Cealaigh",
+"Justify": "Comhfhadaigh",
+"Inline": "Inl\u00edne",
+"Copy": "C\u00f3ipe\u00e1il",
+"Align left": "Ail\u00ednigh ar chl\u00e9",
+"Visual aids": "\u00c1iseanna amhairc",
+"Lower Greek": "Litir Bheag Ghr\u00e9agach",
+"Square": "Cearn\u00f3g",
+"Default": "R\u00e9amhshocr\u00fa",
+"Lower Alpha": "Alfa Beag",
+"Circle": "Ciorcal",
+"Disc": "Diosca",
+"Upper Alpha": "Alfa M\u00f3r",
+"Upper Roman": "Litir Mh\u00f3r R\u00f3mh\u00e1nach",
+"Lower Roman": "Litir Bheag R\u00f3mh\u00e1nach",
+"Name": "Ainm",
+"Anchor": "Ancaire",
+"You have unsaved changes are you sure you want to navigate away?": "T\u00e1 athruithe gan s\u00e1bh\u00e1il ann. An bhfuil t\u00fa cinnte gur mhaith leat imeacht amach as seo?",
+"Restore last draft": "Oscail an dr\u00e9acht is d\u00e9ana\u00ed",
+"Special character": "Carachtar speisialta",
+"Source code": "C\u00f3d foinseach",
+"B": "G",
+"R": "D",
+"G": "U",
+"Color": "Dath",
+"Right to left": "Deas-go-cl\u00e9",
+"Left to right": "Cl\u00e9-go-Deas",
+"Emoticons": "Straoiseoga",
+"Robots": "R\u00f3bait",
+"Document properties": "Air\u00edonna na C\u00e1ip\u00e9ise",
+"Title": "Teideal",
+"Keywords": "Lorgfhocail",
+"Encoding": "Ionch\u00f3d\u00fa",
+"Description": "Cur S\u00edos",
+"Author": "\u00dadar",
+"Fullscreen": "L\u00e1nsc\u00e1ile\u00e1n",
+"Horizontal line": "L\u00edne chothrom\u00e1nach",
+"Horizontal space": "Sp\u00e1s cothrom\u00e1nach",
+"Insert\/edit image": "Cuir \u00edomh\u00e1 isteach\/in eagar",
+"General": "Ginear\u00e1lta",
+"Advanced": "Casta",
+"Source": "Foinse",
+"Border": "Iml\u00edne",
+"Constrain proportions": "Comhr\u00e9ir faoi ghlas",
+"Vertical space": "Sp\u00e1s ingearach",
+"Image description": "Cur s\u00edos ar an \u00edomh\u00e1",
+"Style": "St\u00edl",
+"Dimensions": "Tois\u00ed",
+"Insert image": "Cuir \u00edomh\u00e1 isteach",
+"Zoom in": "Z\u00fam\u00e1il isteach",
+"Contrast": "Codarsnacht",
+"Back": "Siar",
+"Gamma": "G\u00e1ma",
+"Flip horizontally": "Cas go cothrom\u00e1nach",
+"Resize": "Athraigh m\u00e9id",
+"Sharpen": "G\u00e9araigh",
+"Zoom out": "Z\u00fam\u00e1il amach",
+"Image options": "Roghanna \u00edomh\u00e1",
+"Apply": "Cuir i bhfeidhm",
+"Brightness": "Gile",
+"Rotate clockwise": "Rothlaigh ar deiseal",
+"Rotate counterclockwise": "Rothlaigh ar tuathal",
+"Edit image": "Cuir an \u00edomh\u00e1 in eagar",
+"Color levels": "Leibh\u00e9il datha",
+"Crop": "Bear",
+"Orientation": "Treoshu\u00edomh",
+"Flip vertically": "Cas go hingearach",
+"Invert": "Inbh\u00e9artaigh",
+"Insert date\/time": "Cuir d\u00e1ta\/am isteach",
+"Remove link": "Bain an nasc",
+"Url": "URL",
+"Text to display": "T\u00e9acs le taispe\u00e1int",
+"Anchors": "Ancair\u00ed",
+"Insert link": "Cuir nasc isteach",
+"New window": "Fuinneog nua",
+"None": "Dada",
+"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "Is nasc seachtrach \u00e9 an URL a chuir t\u00fa isteach. An bhfuil fonn ort an r\u00e9im\u00edr riachtanach http:\/\/ a chur leis?",
+"Target": "Sprioc",
+"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "Is seoladh r\u00edomhphoist \u00e9 an URL a chuir t\u00fa isteach. An bhfuil fonn ort an r\u00e9im\u00edr riachtanach mailto: a chur leis?",
+"Insert\/edit link": "Cuir nasc isteach\/in eagar",
+"Insert\/edit video": "Cuir f\u00edse\u00e1n isteach\/in eagar",
+"Poster": "P\u00f3staer",
+"Alternative source": "Foinse mhalartach",
+"Paste your embed code below:": "Greamaigh do ch\u00f3d leabaithe th\u00edos:",
+"Insert video": "Cuir f\u00edse\u00e1n isteach",
+"Embed": "Leabaigh",
+"Nonbreaking space": "Sp\u00e1s neamhbhristeach",
+"Page break": "Briseadh leathanaigh",
+"Paste as text": "Greamaigh mar th\u00e9acs",
+"Preview": "R\u00e9amhamharc",
+"Print": "Priont\u00e1il",
+"Save": "S\u00e1bh\u00e1il",
+"Could not find the specified string.": "N\u00edor aims\u00edodh an teaghr\u00e1n.",
+"Replace": "Ionadaigh",
+"Next": "Ar aghaidh",
+"Whole words": "Focail ioml\u00e1na",
+"Find and replace": "Aimsigh agus ionadaigh",
+"Replace with": "Ionadaigh le",
+"Find": "Aimsigh",
+"Replace all": "Ionadaigh uile",
+"Match case": "C\u00e1s-\u00edogair",
+"Prev": "Siar",
+"Spellcheck": "Seice\u00e1il an litri\u00fa",
+"Finish": "Cr\u00edochnaigh",
+"Ignore all": "D\u00e9an neamhaird orthu go l\u00e9ir",
+"Ignore": "D\u00e9an neamhaird air",
+"Add to Dictionary": "Cuir leis an bhFocl\u00f3ir \u00e9",
+"Insert row before": "Ions\u00e1igh r\u00f3 os a chionn",
+"Rows": "R\u00f3nna",
+"Height": "Airde",
+"Paste row after": "Greamaigh r\u00f3 faoi",
+"Alignment": "Ail\u00edni\u00fa",
+"Border color": "Dath na himl\u00edne",
+"Column group": "Gr\u00fapa col\u00fan",
+"Row": "R\u00f3",
+"Insert column before": "Ions\u00e1igh col\u00fan ar chl\u00e9",
+"Split cell": "Roinn cill",
+"Cell padding": "Stu\u00e1il ceall",
+"Cell spacing": "Sp\u00e1s\u00e1il ceall",
+"Row type": "Cine\u00e1l an r\u00f3",
+"Insert table": "Ions\u00e1igh t\u00e1bla",
+"Body": "Corp",
+"Caption": "Fotheideal",
+"Footer": "Bunt\u00e1sc",
+"Delete row": "Scrios an r\u00f3",
+"Paste row before": "Greamaigh r\u00f3 os a chionn",
+"Scope": "Sc\u00f3ip",
+"Delete table": "Scrios an t\u00e1bla",
+"H Align": "Ail\u00edni\u00fa C.",
+"Top": "Barr",
+"Header cell": "Cill cheannt\u00e1isc",
+"Column": "Col\u00fan",
+"Row group": "Gr\u00fapa r\u00f3nna",
+"Cell": "Cill",
+"Middle": "L\u00e1r",
+"Cell type": "Cine\u00e1l na cille",
+"Copy row": "C\u00f3ipe\u00e1il an r\u00f3",
+"Row properties": "Air\u00edonna an r\u00f3",
+"Table properties": "Air\u00edonna an t\u00e1bla",
+"Bottom": "Bun",
+"V Align": "Ail\u00edni\u00fa I.",
+"Header": "Ceannt\u00e1sc",
+"Right": "Ar Dheis",
+"Insert column after": "Ions\u00e1igh col\u00fan ar dheis",
+"Cols": "Col\u00fain",
+"Insert row after": "Ions\u00e1igh r\u00f3 faoi",
+"Width": "Leithead",
+"Cell properties": "Air\u00edonna na cille",
+"Left": "Ar Chl\u00e9",
+"Cut row": "Gearr an r\u00f3",
+"Delete column": "Scrios an col\u00fan",
+"Center": "Sa L\u00e1r",
+"Merge cells": "Cumaisc cealla",
+"Insert template": "Ions\u00e1igh teimpl\u00e9ad",
+"Templates": "Teimpl\u00e9id",
+"Background color": "Dath an ch\u00falra",
+"Custom...": "Saincheap...",
+"Custom color": "Dath saincheaptha",
+"No color": "Gan dath",
+"Text color": "Dath an t\u00e9acs",
+"Show blocks": "Taispe\u00e1in blocanna",
+"Show invisible characters": "Taispe\u00e1in carachtair dhofheicthe",
+"Words: {0}": "Focail: {0}",
+"Insert": "Ions\u00e1ig",
+"File": "Comhad",
+"Edit": "Eagar",
+"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Limist\u00e9ar M\u00e9ith-Th\u00e9acs. Br\u00faigh ALT-F9 le haghaidh roghchl\u00e1ir, ALT-F10 le haghaidh barra uirlis\u00ed, agus ALT-0 le c\u00fanamh a fh\u00e1il",
+"Tools": "Uirlis\u00ed",
+"View": "Amharc",
+"Table": "T\u00e1bla",
+"Format": "Form\u00e1id"
+});
\ No newline at end of file

From 6c7c6379a600141d6275602755cac931d2ce7d33 Mon Sep 17 00:00:00 2001
From: Brian Teeman <brian@teeman.net>
Date: Wed, 18 Nov 2015 15:16:07 +0000
Subject: [PATCH 108/176] Update.

---
 layouts/joomla/edit/details.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/layouts/joomla/edit/details.php b/layouts/joomla/edit/details.php
index 1ca070bc38e69..876c3f5884da5 100644
--- a/layouts/joomla/edit/details.php
+++ b/layouts/joomla/edit/details.php
@@ -9,7 +9,7 @@
  * @deprecated  3.2
  */
 
-defined('JPATH_BASE') or die;;
+defined('JPATH_BASE') or die;
 
 $app = JFactory::getApplication();
 

From 9eb5d9b3ce615f3d277c925de319d6d662e10675 Mon Sep 17 00:00:00 2001
From: Jean-Marie Simonet <infografjms@gmail.com>
Date: Wed, 18 Nov 2015 17:26:51 +0100
Subject: [PATCH 109/176] Correcting Beez3 search and smartsearch display

---
 .../views/search/tmpl/default_form.php        |  2 +-
 modules/mod_finder/tmpl/default.php           |  2 +-
 templates/beez3/css/general.css               |  2 +-
 templates/beez3/css/layout.css                | 22 ++++++++++++++++---
 templates/beez3/css/template_rtl.css          | 17 ++++++++++++++
 5 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/components/com_search/views/search/tmpl/default_form.php b/components/com_search/views/search/tmpl/default_form.php
index 81e4f6237ad91..94b4efcae6e69 100644
--- a/components/com_search/views/search/tmpl/default_form.php
+++ b/components/com_search/views/search/tmpl/default_form.php
@@ -21,7 +21,7 @@
 			<input type="text" name="searchword" placeholder="<?php echo JText::_('COM_SEARCH_SEARCH_KEYWORD'); ?>" id="search-searchword" size="30" maxlength="<?php echo $upper_limit; ?>" value="<?php echo $this->escape($this->origkeyword); ?>" class="inputbox" />
 		</div>
 		<div class="btn-group pull-left">
-			<button name="Search" onclick="this.form.submit()" class="btn hasTooltip" title="<?php echo JHtml::tooltipText('COM_SEARCH_SEARCH');?>"><span class="icon-search"></span></button>
+			<button name="Search" onclick="this.form.submit()" class="btn hasTooltip" title="<?php echo JHtml::tooltipText('COM_SEARCH_SEARCH');?>"><span class="icon-search"></span><?php echo JText::_('JSEARCH_FILTER_SUBMIT'); ?></button>
 		</div>
 		<input type="hidden" name="task" value="search" />
 		<div class="clearfix"></div>
diff --git a/modules/mod_finder/tmpl/default.php b/modules/mod_finder/tmpl/default.php
index db56d1f28eee7..f944e4e44ee58 100644
--- a/modules/mod_finder/tmpl/default.php
+++ b/modules/mod_finder/tmpl/default.php
@@ -50,7 +50,7 @@
 
 if ($params->get('show_button'))
 {
-	$button = '<button class="btn btn-primary hasTooltip ' . $suffix . ' finder' . $suffix . '" type="submit" title="' . JText::_('MOD_FINDER_SEARCH_BUTTON') . '"><span class="icon-search icon-white"></span></button>';
+	$button = '<button class="btn btn-primary hasTooltip ' . $suffix . ' finder' . $suffix . '" type="submit" title="' . JText::_('MOD_FINDER_SEARCH_BUTTON') . '"><span class="icon-search icon-white"></span>' . JText::_('JSEARCH_FILTER_SUBMIT') . '</button>';
 
 	switch ($params->get('button_pos', 'left'))
 	{
diff --git a/templates/beez3/css/general.css b/templates/beez3/css/general.css
index bf278c41cd171..90ac057115a76 100644
--- a/templates/beez3/css/general.css
+++ b/templates/beez3/css/general.css
@@ -469,4 +469,4 @@ body input[type="text"].search-query {
 }
 .text-center {
 	text-align: center;
-}
+}
\ No newline at end of file
diff --git a/templates/beez3/css/layout.css b/templates/beez3/css/layout.css
index d759f80c17f5a..9cf9e04c69b62 100644
--- a/templates/beez3/css/layout.css
+++ b/templates/beez3/css/layout.css
@@ -331,7 +331,6 @@ fieldset.word {
 
 fieldset.phrases label,fieldset.only label {
 	display: inline;
-	margin: 0 10px
 }
 
  :root *> fieldset.only label:before {
@@ -348,7 +347,6 @@ fieldset.phrases label,fieldset.only label {
 	margin: 0 4px 0 0;
 	text-transform: uppercase;
 	width: 1em;
-	content: ".";
 	display: inline-block;
 	margin-left: -40px;
 	padding: 2px;
@@ -379,7 +377,6 @@ input[type="checkbox"]:checked+label:before {
 	margin: 0 4px 0 0;
 	text-transform: uppercase;
 	width: 1.3em;
-	content: ".";
 	display: inline-block;
 	margin-left: -40px;
 	-moz-border-radius: 12px;
@@ -1051,3 +1048,22 @@ div.current {
 	vertical-align: middle;
 	width: 18px;
 }
+/* Smartsearch Calendar*/
+#filter_date1_img,
+#filter_date2_img {
+	background: rgba(0, 0, 0, 0) url("../images/system/calendar.png") no-repeat scroll 0 0;
+	cursor: pointer;
+	height: 18px;
+	margin-left: 3px;
+	vertical-align: middle;
+	width: 18px;
+}
+#search-results {
+	clear: both;
+}
+#finder-filter-window {
+	overflow: visible;
+}
+#searchForm .searchintro {
+	padding: 0 0 0 250px;
+}
\ No newline at end of file
diff --git a/templates/beez3/css/template_rtl.css b/templates/beez3/css/template_rtl.css
index 3b8b67d151301..7355cc359477b 100644
--- a/templates/beez3/css/template_rtl.css
+++ b/templates/beez3/css/template_rtl.css
@@ -533,3 +533,20 @@ ul.menu li ul li ul li ul li ul {
 	right: 50%;
 	margin-right: -5px;
 }
+
+/* Smartsearch Calendar*/
+#filter_date1_img,
+#filter_date2_img {
+	margin-left: 0;
+	margin-right: 3px;
+}
+ul#finder-filter-select-dates li.filter-date {
+	text-align: right;
+}
+.radio, .checkbox {
+	padding-left: 0;
+	padding-right: 4px;
+}
+#searchForm .searchintro {
+	padding: 0 250px 0 0;
+}
\ No newline at end of file

From 77aa6a0edb1219f78416cc8b3373e763f5566afa Mon Sep 17 00:00:00 2001
From: Pavel Novikov <NovikovPV_8605@AB.SRB.LOCAL>
Date: Wed, 18 Nov 2015 19:41:03 +0300
Subject: [PATCH 110/176] [fix] fixing limit.start state in JModelList

---
 libraries/legacy/model/list.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libraries/legacy/model/list.php b/libraries/legacy/model/list.php
index b5828eaaecb65..fa6ccb777c831 100644
--- a/libraries/legacy/model/list.php
+++ b/libraries/legacy/model/list.php
@@ -555,10 +555,13 @@ protected function populateState($ordering = null, $direction = null)
 								break;
 
 							case 'limit':
-							case 'start':
 								$limit = $inputFilter->clean($value, 'int');
 								break;
 
+							case 'start':
+								$value = $inputFilter->clean($value, 'int');
+								break;
+
 							case 'select':
 								$explodedValue = explode(',', $value);
 

From 6dc060fffd2505706cd594df304536515bbfb791 Mon Sep 17 00:00:00 2001
From: dgt41 <d.grammatiko@gmail.com>
Date: Wed, 18 Nov 2015 21:45:13 +0200
Subject: [PATCH 111/176] behave

---
 plugins/system/stats/stats.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/plugins/system/stats/stats.php b/plugins/system/stats/stats.php
index 65168be1f9112..3a3ad94289694 100644
--- a/plugins/system/stats/stats.php
+++ b/plugins/system/stats/stats.php
@@ -94,6 +94,11 @@ public function onAfterInitialise()
 			return;
 		}
 
+		if (JUri::getInstance()->getVar("tmpl") === "component")
+		{
+			return;
+		}
+
 		JHtml::_('jquery.framework');
 		JHtml::script('plg_system_stats/stats.js', false, true, false);
 	}

From a14b00a3d9b076d256152f686754d6e06b688778 Mon Sep 17 00:00:00 2001
From: Jean-Marie Simonet <infografjms@gmail.com>
Date: Thu, 19 Nov 2015 08:52:52 +0100
Subject: [PATCH 112/176] Protostar: Getting rid of scroll bar in smartsearch
 Advanced search

---
 templates/protostar/css/template.css   |  9 +++++++++
 templates/protostar/less/template.less | 14 ++++++++++++--
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/templates/protostar/css/template.css b/templates/protostar/css/template.css
index 1ba67e4bbd3e5..2f880bb4631ce 100644
--- a/templates/protostar/css/template.css
+++ b/templates/protostar/css/template.css
@@ -7502,3 +7502,12 @@ body.modal-open {
 	padding: 5px 10px;
 	overflow: hidden;
 }
+#search-results {
+	clear: both;
+}
+#finder-filter-window {
+	overflow: visible;
+}
+#finder-search .in.collapse {
+	overflow: visible;
+}
diff --git a/templates/protostar/less/template.less b/templates/protostar/less/template.less
index db4e3b9821837..cea47b32c16d4 100644
--- a/templates/protostar/less/template.less
+++ b/templates/protostar/less/template.less
@@ -626,8 +626,18 @@ body.modal-open {
 	display: inline;
 }
 
-/*Corrects the modals padding*/
+/* Corrects the modals padding */
 .field-media-wrapper .modal .modal-body {
 	padding: 5px 10px;
 	overflow: hidden;
-}
\ No newline at end of file
+}
+/* Getting rid of scroll bar in smartsearch Advanced search */
+#search-results {
+	clear: both;
+}
+#finder-filter-window {
+	overflow: visible;
+}
+#finder-search .in.collapse {
+	overflow: visible;
+}

From 3f90e4b1c3cb21b6693ffe21c490928851dca4de Mon Sep 17 00:00:00 2001
From: Jean-Marie Simonet <infografjms@gmail.com>
Date: Thu, 19 Nov 2015 10:03:19 +0100
Subject: [PATCH 113/176] Allowing smartsearch Advanced search to collapse

---
 templates/beez3/css/layout.css | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/templates/beez3/css/layout.css b/templates/beez3/css/layout.css
index 9cf9e04c69b62..e60f587c33e9a 100644
--- a/templates/beez3/css/layout.css
+++ b/templates/beez3/css/layout.css
@@ -1066,4 +1066,19 @@ div.current {
 }
 #searchForm .searchintro {
 	padding: 0 0 0 250px;
+}
+.collapse {
+	position: relative;
+	height: 0;
+	overflow: hidden;
+	-webkit-transition: height .35s ease;
+	-moz-transition: height .35s ease;
+	-o-transition: height .35s ease;
+	transition: height .35s ease;
+}
+.collapse.in {
+	height: auto;
+}
+#finder-search .in.collapse {
+	overflow: visible;
 }
\ No newline at end of file

From c9d84fc925431147e1b5ace842f398b801c7eeca Mon Sep 17 00:00:00 2001
From: Jean-Marie Simonet <infografjms@gmail.com>
Date: Thu, 19 Nov 2015 11:31:21 +0100
Subject: [PATCH 114/176] Missing language string in admin com_media.ini

---
 administrator/language/en-GB/en-GB.com_media.ini | 1 +
 1 file changed, 1 insertion(+)

diff --git a/administrator/language/en-GB/en-GB.com_media.ini b/administrator/language/en-GB/en-GB.com_media.ini
index e3b78f721d77b..0ccef68809267 100644
--- a/administrator/language/en-GB/en-GB.com_media.ini
+++ b/administrator/language/en-GB/en-GB.com_media.ini
@@ -73,6 +73,7 @@ COM_MEDIA_FILESIZE="File size"
 COM_MEDIA_FOLDER="Folder"
 COM_MEDIA_FOLDERS="Media Folders"
 COM_MEDIA_FOLDERS_PATH_LABEL="<strong>Warning! Path Folder</strong><br />Changing the 'Path to files folder' from the default of 'images' may break your links.<br />The 'Path to images' folder has to be the same or a subfolder of 'Path to files'."
+COM_MEDIA_IMAGE_DESCRIPTION="Image Description"
 COM_MEDIA_IMAGE_DIMENSIONS="%1$s x %2$s"
 COM_MEDIA_IMAGE_TITLE="%1$s - %2$s"
 COM_MEDIA_IMAGE_URL="Image URL"

From fbced853992a96acdb11b4a1c46f36ffccfd87f1 Mon Sep 17 00:00:00 2001
From: Brian Teeman <brian@teeman.net>
Date: Thu, 19 Nov 2015 10:35:59 +0000
Subject: [PATCH 115/176] Update readonly.php

---
 .../components/com_templates/views/template/tmpl/readonly.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/administrator/components/com_templates/views/template/tmpl/readonly.php b/administrator/components/com_templates/views/template/tmpl/readonly.php
index 2da41dad0dfd8..5ac64528c6e3c 100644
--- a/administrator/components/com_templates/views/template/tmpl/readonly.php
+++ b/administrator/components/com_templates/views/template/tmpl/readonly.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_templates
  *
- * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 

From bcea19344047b13ce710246ba8075148b9baf2d8 Mon Sep 17 00:00:00 2001
From: Brian Teeman <brian@teeman.net>
Date: Thu, 19 Nov 2015 10:36:31 +0000
Subject: [PATCH 116/176] Update contenthistory.php

---
 layouts/joomla/form/field/contenthistory.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/layouts/joomla/form/field/contenthistory.php b/layouts/joomla/form/field/contenthistory.php
index 5b79c0714215c..20488112ac575 100644
--- a/layouts/joomla/form/field/contenthistory.php
+++ b/layouts/joomla/form/field/contenthistory.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -23,4 +23,4 @@
 ?>
 <button class="btn modal_<?php echo $item; ?>" title="<?php echo $label; ?>" href="<?php echo $link; ?>" rel="{handler: 'iframe', size: {x: 800, y: 500}}">
 	<span class="icon-archive"></span><?php echo $label; ?>
-</button>
\ No newline at end of file
+</button>

From 474d502bfb04abbc850346361c8310caafb7fac7 Mon Sep 17 00:00:00 2001
From: Brian Teeman <brian@teeman.net>
Date: Thu, 19 Nov 2015 10:37:20 +0000
Subject: [PATCH 117/176] Update interface.php

---
 libraries/joomla/session/handler/interface.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/joomla/session/handler/interface.php b/libraries/joomla/session/handler/interface.php
index 94d989c732e10..7c0c8f07992d1 100644
--- a/libraries/joomla/session/handler/interface.php
+++ b/libraries/joomla/session/handler/interface.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Session
  *
- * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 

From 7a68582f5bec7a5a9dacfb4806e5355a035337da Mon Sep 17 00:00:00 2001
From: Brian Teeman <brian@teeman.net>
Date: Thu, 19 Nov 2015 10:37:43 +0000
Subject: [PATCH 118/176] Update joomla.php

---
 libraries/joomla/session/handler/joomla.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/joomla/session/handler/joomla.php b/libraries/joomla/session/handler/joomla.php
index f2fb4db709ec8..274a28493f254 100644
--- a/libraries/joomla/session/handler/joomla.php
+++ b/libraries/joomla/session/handler/joomla.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Session
  *
- * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 

From 394e7acaedceb80af2206004363ce4e48acf0c6c Mon Sep 17 00:00:00 2001
From: Brian Teeman <brian@teeman.net>
Date: Thu, 19 Nov 2015 10:38:04 +0000
Subject: [PATCH 119/176] Update native.php

---
 libraries/joomla/session/handler/native.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/joomla/session/handler/native.php b/libraries/joomla/session/handler/native.php
index 2904ee36a46f3..02fe80b28203f 100644
--- a/libraries/joomla/session/handler/native.php
+++ b/libraries/joomla/session/handler/native.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Session
  *
- * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 

From ef20a96822e7e7a653597a5ba494bc0f35a56e74 Mon Sep 17 00:00:00 2001
From: Brian Teeman <brian@teeman.net>
Date: Thu, 19 Nov 2015 10:38:55 +0000
Subject: [PATCH 120/176] Update contenthistory.php

---
 .../html/layouts/joomla/form/field/contenthistory.php         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/protostar/html/layouts/joomla/form/field/contenthistory.php b/templates/protostar/html/layouts/joomla/form/field/contenthistory.php
index a8fed269a9d89..89867fd186e6f 100644
--- a/templates/protostar/html/layouts/joomla/form/field/contenthistory.php
+++ b/templates/protostar/html/layouts/joomla/form/field/contenthistory.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -34,4 +34,4 @@
 ?>
 <button onclick="jQuery('#versionsModal').modal('show')" class="btn" data-toggle="modal" title="<?php echo $label; ?>">
 	<span class="icon-archive"></span><?php echo $label; ?>
-</button>
\ No newline at end of file
+</button>

From 9174708b73cff4e7065f6416526e918012fe19e1 Mon Sep 17 00:00:00 2001
From: dgt41 <d.grammatiko@gmail.com>
Date: Thu, 19 Nov 2015 12:45:42 +0200
Subject: [PATCH 121/176] For B/C no bootstrap tabs by default

---
 .../com_media/views/images/tmpl/default.php   | 232 ++++++++----------
 1 file changed, 109 insertions(+), 123 deletions(-)

diff --git a/administrator/components/com_media/views/images/tmpl/default.php b/administrator/components/com_media/views/images/tmpl/default.php
index e48b7eddcd23e..5e55ddf3bc184 100644
--- a/administrator/components/com_media/views/images/tmpl/default.php
+++ b/administrator/components/com_media/views/images/tmpl/default.php
@@ -35,136 +35,122 @@
 	"
 );
 ?>
-<div class="tabbable">
-	<ul class="nav nav-tabs">
-		<li class="active"><a href="#browse_tab" data-toggle="tab"><?php echo JText::_('COM_MEDIA_BROWSE_FILES') ?></a></li>
-		<li><a href="#upload_tab" data-toggle="tab"><?php echo JText::_('COM_MEDIA_UPLOAD') ?></a></li>
-	</ul>
-
-	<div class="tab-content">
-		<div class="tab-pane active" id="browse_tab">
-			<form action="index.php?option=com_media&amp;asset=<?php echo $input->getCmd('asset');?>&amp;author=<?php echo $input->getCmd('author'); ?>" class="form-vertical" id="imageForm" method="post" enctype="multipart/form-data">
-				<div id="messages" style="display: none;">
-					<span id="message"></span><?php echo JHtml::_('image', 'media/dots.gif', '...', array('width' => 22, 'height' => 12), true) ?>
+<form action="index.php?option=com_media&amp;asset=<?php echo $input->getCmd('asset');?>&amp;author=<?php echo $input->getCmd('author'); ?>" class="form-vertical" id="imageForm" method="post" enctype="multipart/form-data">
+	<div id="messages" style="display: none;">
+		<span id="message"></span><?php echo JHtml::_('image', 'media/dots.gif', '...', array('width' => 22, 'height' => 12), true) ?>
+	</div>
+	<div class="well">
+		<div class="row">
+			<div class="span12 control-group">
+				<div class="control-label">
+					<label class="control-label" for="folder"><?php echo JText::_('COM_MEDIA_DIRECTORY') ?></label>
 				</div>
-				<div class="well">
-					<div class="row">
-						<div class="span12 control-group">
-							<div class="control-label">
-								<label class="control-label" for="folder"><?php echo JText::_('COM_MEDIA_DIRECTORY') ?></label>
-							</div>
-							<div class="controls">
-								<?php echo $this->folderList; ?>
-								<button class="btn" type="button" id="upbutton" title="<?php echo JText::_('COM_MEDIA_DIRECTORY_UP') ?>"><?php echo JText::_('COM_MEDIA_UP') ?></button>
-							</div>
-						</div>
-						<div class="pull-right">
-							<button class="btn btn-success button-save-selected" type="button" onclick="<?php if ($this->state->get('field.id')):?>window.parent.jInsertFieldValue(document.getElementById('f_url').value,'<?php echo $this->state->get('field.id');?>');<?php else:?>ImageManager.onok();<?php endif;?>window.parent.jModalClose();" data-dismiss="modal"><?php echo JText::_('COM_MEDIA_INSERT') ?></button>
-							<button class="btn button-cancel" type="button" <?php if (!$this->state->get('field.id')) :
-							// This is for Mootools compatibility ?>onclick="parent.jModalClose();"<?php endif;?> data-dismiss="modal"><?php echo JText::_('JCANCEL') ?></button>
-						</div>
-					</div>
+				<div class="controls">
+					<?php echo $this->folderList; ?>
+					<button class="btn" type="button" id="upbutton" title="<?php echo JText::_('COM_MEDIA_DIRECTORY_UP') ?>"><?php echo JText::_('COM_MEDIA_UP') ?></button>
 				</div>
+			</div>
+			<div class="pull-right">
+				<button class="btn btn-success button-save-selected" type="button" onclick="<?php if ($this->state->get('field.id')):?>window.parent.jInsertFieldValue(document.getElementById('f_url').value,'<?php echo $this->state->get('field.id');?>');<?php else:?>ImageManager.onok();<?php endif;?>window.parent.jModalClose();" data-dismiss="modal"><?php echo JText::_('COM_MEDIA_INSERT') ?></button>
+				<button class="btn button-cancel" type="button" <?php if (!$this->state->get('field.id')) :
+				// This is for Mootools compatibility ?>onclick="parent.jModalClose();"<?php endif;?> data-dismiss="modal"><?php echo JText::_('JCANCEL') ?></button>
+			</div>
+		</div>
+	</div>
 
-				<iframe id="imageframe" name="imageframe" src="index.php?option=com_media&amp;view=imagesList&amp;tmpl=component&amp;folder=<?php echo $this->state->folder?>&amp;asset=<?php echo $input->getCmd('asset');?>&amp;author=<?php echo $input->getCmd('author');?>"></iframe>
+	<iframe id="imageframe" name="imageframe" src="index.php?option=com_media&amp;view=imagesList&amp;tmpl=component&amp;folder=<?php echo $this->state->folder?>&amp;asset=<?php echo $input->getCmd('asset');?>&amp;author=<?php echo $input->getCmd('author');?>"></iframe>
 
-				<div class="well">
-					<div class="row">
-						<div class="span6 control-group">
-							<div class="control-label">
-								<label for="f_url"><?php echo JText::_('COM_MEDIA_IMAGE_URL') ?></label>
-							</div>
-							<div class="controls">
-								<input type="text" id="f_url" value="" />
-							</div>
-						</div>
-						<?php if (!$this->state->get('field.id')):?>
-							<div class="span6 control-group">
-								<div class="control-label">
-									<label title="<?php echo JText::_('COM_MEDIA_ALIGN_DESC'); ?>" class="noHtmlTip" for="f_align"><?php echo JText::_('COM_MEDIA_ALIGN') ?></label>
-								</div>
-								<div class="controls">
-									<select size="1" id="f_align">
-										<option value="" selected="selected"><?php echo JText::_('COM_MEDIA_NOT_SET') ?></option>
-										<option value="left"><?php echo JText::_('JGLOBAL_LEFT') ?></option>
-										<option value="center"><?php echo JText::_('JGLOBAL_CENTER') ?></option>
-										<option value="right"><?php echo JText::_('JGLOBAL_RIGHT') ?></option>
-									</select>
-								</div>
-							</div>
-						<?php endif;?>
+	<div class="well">
+		<div class="row">
+			<div class="span6 control-group">
+				<div class="control-label">
+					<label for="f_url"><?php echo JText::_('COM_MEDIA_IMAGE_URL') ?></label>
+				</div>
+				<div class="controls">
+					<input type="text" id="f_url" value="" />
+				</div>
+			</div>
+			<?php if (!$this->state->get('field.id')):?>
+				<div class="span6 control-group">
+					<div class="control-label">
+						<label title="<?php echo JText::_('COM_MEDIA_ALIGN_DESC'); ?>" class="noHtmlTip" for="f_align"><?php echo JText::_('COM_MEDIA_ALIGN') ?></label>
+					</div>
+					<div class="controls">
+						<select size="1" id="f_align">
+							<option value="" selected="selected"><?php echo JText::_('COM_MEDIA_NOT_SET') ?></option>
+							<option value="left"><?php echo JText::_('JGLOBAL_LEFT') ?></option>
+							<option value="center"><?php echo JText::_('JGLOBAL_CENTER') ?></option>
+							<option value="right"><?php echo JText::_('JGLOBAL_RIGHT') ?></option>
+						</select>
 					</div>
-					<?php if (!$this->state->get('field.id')):?>
-						<div class="row">
-							<div class="span6 control-group">
-								<div class="control-label">
-									<label for="f_alt"><?php echo JText::_('COM_MEDIA_IMAGE_DESCRIPTION') ?></label>
-								</div>
-								<div class="controls">
-									<input type="text" id="f_alt" value="" />
-								</div>
-							</div>
-							<div class="span6 control-group">
-								<div class="control-label">
-									<label for="f_title"><?php echo JText::_('COM_MEDIA_TITLE') ?></label>
-								</div>
-								<div class="controls">
-									<input type="text" id="f_title" value="" />
-								</div>
-							</div>
-						</div>
-						<div class="row">
-							<div class="span6 control-group">
-								<div class="control-label">
-									<label for="f_caption"><?php echo JText::_('COM_MEDIA_CAPTION') ?></label>
-								</div>
-								<div class="controls">
-									<input type="text" id="f_caption" value="" />
-								</div>
-							</div>
-							<div class="span6 control-group">
-								<div class="control-label">
-									<label title="<?php echo JText::_('COM_MEDIA_CAPTION_CLASS_DESC'); ?>" class="noHtmlTip" for="f_caption_class"><?php echo JText::_('COM_MEDIA_CAPTION_CLASS_LABEL') ?></label>
-								</div>
-								<div class="controls">
-									<input type="text" list="d_caption_class" id="f_caption_class" value="" />
-									<datalist id="d_caption_class">
-										<option value="text-left">
-										<option value="text-center">
-										<option value="text-right">
-									</datalist>
-								</div>
-							</div>
-						</div>
-					<?php endif;?>
-
-					<input type="hidden" id="dirPath" name="dirPath" />
-					<input type="hidden" id="f_file" name="f_file" />
-					<input type="hidden" id="tmpl" name="component" />
-
 				</div>
-			</form>
+			<?php endif;?>
 		</div>
-		<div class="tab-pane" id="upload_tab">
-			<?php if ($user->authorise('core.create', 'com_media')) : ?>
-				<form action="<?php echo JUri::base(); ?>index.php?option=com_media&amp;task=file.upload&amp;tmpl=component&amp;<?php echo $this->session->getName() . '=' . $this->session->getId(); ?>&amp;<?php echo JSession::getFormToken();?>=1&amp;asset=<?php echo $input->getCmd('asset'); ?>&amp;author=<?php echo $input->getCmd('author'); ?>&amp;view=images" id="uploadForm" class="form-horizontal" name="uploadForm" method="post" enctype="multipart/form-data">
-					<div id="uploadform" class="well">
-						<fieldset id="upload-noflash" class="actions">
-							<div class="control-group">
-								<div class="control-label">
-									<label for="upload-file" class="control-label"><?php echo JText::_('COM_MEDIA_UPLOAD_FILE'); ?></label>
-								</div>
-								<div class="controls">
-									<input type="file" id="upload-file" name="Filedata[]" multiple /><button class="btn btn-primary" id="upload-submit"><span class="icon-upload icon-white"></span> <?php echo JText::_('COM_MEDIA_START_UPLOAD'); ?></button>
-									<p class="help-block"><?php echo $this->config->get('upload_maxsize') == '0' ? JText::_('COM_MEDIA_UPLOAD_FILES_NOLIMIT') : JText::sprintf('COM_MEDIA_UPLOAD_FILES', $this->config->get('upload_maxsize')); ?></p>
-								</div>
-							</div>
-						</fieldset>
-						<?php JFactory::getSession()->set('com_media.return_url', 'index.php?option=com_media&view=images&tmpl=component&fieldid=' . $input->getCmd('fieldid', '') . '&e_name=' . $input->getCmd('e_name') . '&asset=' . $input->getCmd('asset') . '&author=' . $input->getCmd('author')); ?>
+		<?php if (!$this->state->get('field.id')):?>
+			<div class="row">
+				<div class="span6 control-group">
+					<div class="control-label">
+						<label for="f_alt"><?php echo JText::_('COM_MEDIA_IMAGE_DESCRIPTION') ?></label>
+					</div>
+					<div class="controls">
+						<input type="text" id="f_alt" value="" />
+					</div>
+				</div>
+				<div class="span6 control-group">
+					<div class="control-label">
+						<label for="f_title"><?php echo JText::_('COM_MEDIA_TITLE') ?></label>
+					</div>
+					<div class="controls">
+						<input type="text" id="f_title" value="" />
 					</div>
-				</form>
-			<?php endif; ?>
+				</div>
+			</div>
+			<div class="row">
+				<div class="span6 control-group">
+					<div class="control-label">
+						<label for="f_caption"><?php echo JText::_('COM_MEDIA_CAPTION') ?></label>
+					</div>
+					<div class="controls">
+						<input type="text" id="f_caption" value="" />
+					</div>
+				</div>
+				<div class="span6 control-group">
+					<div class="control-label">
+						<label title="<?php echo JText::_('COM_MEDIA_CAPTION_CLASS_DESC'); ?>" class="noHtmlTip" for="f_caption_class"><?php echo JText::_('COM_MEDIA_CAPTION_CLASS_LABEL') ?></label>
+					</div>
+					<div class="controls">
+						<input type="text" list="d_caption_class" id="f_caption_class" value="" />
+						<datalist id="d_caption_class">
+							<option value="text-left">
+							<option value="text-center">
+							<option value="text-right">
+						</datalist>
+					</div>
+				</div>
+			</div>
+		<?php endif;?>
+
+		<input type="hidden" id="dirPath" name="dirPath" />
+		<input type="hidden" id="f_file" name="f_file" />
+		<input type="hidden" id="tmpl" name="component" />
 
-		</div>
 	</div>
-</div>
+</form>
+<?php if ($user->authorise('core.create', 'com_media')) : ?>
+	<form action="<?php echo JUri::base(); ?>index.php?option=com_media&amp;task=file.upload&amp;tmpl=component&amp;<?php echo $this->session->getName() . '=' . $this->session->getId(); ?>&amp;<?php echo JSession::getFormToken();?>=1&amp;asset=<?php echo $input->getCmd('asset'); ?>&amp;author=<?php echo $input->getCmd('author'); ?>&amp;view=images" id="uploadForm" class="form-horizontal" name="uploadForm" method="post" enctype="multipart/form-data">
+		<div id="uploadform" class="well">
+			<fieldset id="upload-noflash" class="actions">
+				<div class="control-group">
+					<div class="control-label">
+						<label for="upload-file" class="control-label"><?php echo JText::_('COM_MEDIA_UPLOAD_FILE'); ?></label>
+					</div>
+					<div class="controls">
+						<input type="file" id="upload-file" name="Filedata[]" multiple /><button class="btn btn-primary" id="upload-submit"><span class="icon-upload icon-white"></span> <?php echo JText::_('COM_MEDIA_START_UPLOAD'); ?></button>
+						<p class="help-block"><?php echo $this->config->get('upload_maxsize') == '0' ? JText::_('COM_MEDIA_UPLOAD_FILES_NOLIMIT') : JText::sprintf('COM_MEDIA_UPLOAD_FILES', $this->config->get('upload_maxsize')); ?></p>
+					</div>
+				</div>
+			</fieldset>
+			<?php JFactory::getSession()->set('com_media.return_url', 'index.php?option=com_media&view=images&tmpl=component&fieldid=' . $input->getCmd('fieldid', '') . '&e_name=' . $input->getCmd('e_name') . '&asset=' . $input->getCmd('asset') . '&author=' . $input->getCmd('author')); ?>
+		</div>
+	</form>
+<?php endif; ?>

From 98b65084d75e94ee37c5e8996f131ec592299a0e Mon Sep 17 00:00:00 2001
From: Robert Deutz <rdeutz@googlemail.com>
Date: Thu, 19 Nov 2015 14:16:00 +0100
Subject: [PATCH 122/176] allow PHP7 to fail

---
 .travis.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 10837ae2ab437..d35abf3dde240 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,6 +10,10 @@ php:
   - 5.6
   - 7.0
 
+matrix:
+  allow_failures:
+    - php: 7.0
+
 services:
   - memcached
   - redis-server

From 246d71c96ca446fb3997000088e371cfb45bda41 Mon Sep 17 00:00:00 2001
From: Brian Teeman <brian@teeman.net>
Date: Thu, 19 Nov 2015 14:14:19 +0000
Subject: [PATCH 123/176] Expires date

---
 libraries/joomla/application/web.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/joomla/application/web.php b/libraries/joomla/application/web.php
index 735adac02fed7..4e06bb03c9b31 100644
--- a/libraries/joomla/application/web.php
+++ b/libraries/joomla/application/web.php
@@ -436,7 +436,7 @@ protected function respond()
 		if (!$this->response->cachable)
 		{
 			// Expires in the past.
-			$this->setHeader('Expires', 'Mon, 1 Jan 2001 00:00:00 GMT', true);
+			$this->setHeader('Expires', 'Wed, 17 Aug 2005 00:00:00 GMT', true);
 
 			// Always modified.
 			$this->setHeader('Last-Modified', gmdate('D, d M Y H:i:s') . ' GMT', true);

From 810f6425c2afb2db253f1b605746b7c704505a8b Mon Sep 17 00:00:00 2001
From: Robert Deutz <rdeutz@googlemail.com>
Date: Thu, 19 Nov 2015 17:00:16 +0100
Subject: [PATCH 124/176] Update .travis.yml

Travis problem should be fixed now
---
 .travis.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d35abf3dde240..10837ae2ab437 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,10 +10,6 @@ php:
   - 5.6
   - 7.0
 
-matrix:
-  allow_failures:
-    - php: 7.0
-
 services:
   - memcached
   - redis-server

From 74408942f148166c30ba893531a3664bd68f99b8 Mon Sep 17 00:00:00 2001
From: zero-24 <zero-24@users.noreply.github.com>
Date: Thu, 19 Nov 2015 17:53:17 +0100
Subject: [PATCH 125/176] fix stats script php

---
 administrator/components/com_admin/script.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/administrator/components/com_admin/script.php b/administrator/components/com_admin/script.php
index d5960a92567f7..2762b5a6dbb36 100644
--- a/administrator/components/com_admin/script.php
+++ b/administrator/components/com_admin/script.php
@@ -77,6 +77,8 @@ protected function clearStatsCache()
 			$params['lastrun'] = '';
 		}
 
+		$params = json_encode($params);
+
 		$query = $db->getQuery(true)
 			->update($db->quoteName('#__extensions'))
 			->set($db->quoteName('params') . ' = ' . $db->quote($params))

From 90639e8ae385a9c1e42b0f3bd06732c3d8fab4b9 Mon Sep 17 00:00:00 2001
From: Thomas Hunziker <werbemails@bakual.ch>
Date: Thu, 19 Nov 2015 20:47:31 +0100
Subject: [PATCH 126/176] Updating installation languages (bs-BA and sy-IQ)

---
 installation/language/bs-BA/bs-BA.ini | 2 +-
 installation/language/bs-BA/bs-BA.xml | 4 ++--
 installation/language/sy-IQ/sy-IQ.ini | 2 +-
 installation/language/sy-IQ/sy-IQ.xml | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/installation/language/bs-BA/bs-BA.ini b/installation/language/bs-BA/bs-BA.ini
index 31a0008b96527..ff84bf2a92482 100644
--- a/installation/language/bs-BA/bs-BA.ini
+++ b/installation/language/bs-BA/bs-BA.ini
@@ -89,7 +89,7 @@ INSTL_SAMPLE_LEARN_SET="Joomla Engleski (GB) Set primjera za učenje"
 INSTL_SAMPLE_TESTING_SET="Testni Engleski (GB) Set primjera"
 INSTL_SITE_INSTALL_SAMPLE_NONE_DESC="Instalacija Joomla! sa samo jednim izbornikom i formom za prijavu, bez ikakvog sadržaja."
 INSTL_SAMPLE_BLOG_SET_DESC="Instalacija Joomla! sa nekoliko članaka i blog modulima kao Stariji postovi, Blog roll, Najčitaniji postovi."
-INSTL_SAMPLE_BROCHURE_SET_DESC="Instalacija Joomla! sa nekoliko stranica (Izbornik sa stranicom Naslovna, O nama, Novosti, Kontaktirajte nas) i modulima kao Pretraga, Prilagođeni HTML, Forma za prijavu."
+INSTL_SAMPLE_BROCHURE_SET_DESC="Instalacija Joomla! sa nekoliko stranica (Izbornik sa stranicom Naslovna, O nama, Novosti, Kontaktirajte nas) i modulima kao Pretraga, Prilagođeno, Forma za prijavu."
 INSTL_SAMPLE_DATA_SET_DESC="Instalacija Joomla! sa jednom stranicom (izbornik sa jednim linkom) i modulima kao Zadnji članak, Forma za prijavu."
 INSTL_SAMPLE_LEARN_SET_DESC="Instalacija Joomla! sa primjerima članaka koji opisuju kako Joomla! radi."
 INSTL_SAMPLE_TESTING_SET_DESC="Instalacija Joomla! sa svim mogućim stavkama izbornika za pomoć kod testiranja."
diff --git a/installation/language/bs-BA/bs-BA.xml b/installation/language/bs-BA/bs-BA.xml
index abdd5d98c9f50..e8cfc532147f2 100644
--- a/installation/language/bs-BA/bs-BA.xml
+++ b/installation/language/bs-BA/bs-BA.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <metafile
-	version="3.4"
+	version="3.5"
 	client="installation">
 	<name>Bosanski (BA)</name>
-	<version>3.4.4</version>
+	<version>3.5.0</version>
 	<creationDate>September 2012</creationDate>
 	<author>Bosnian Translation Team</author>
  	<copyright>Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved.</copyright>
diff --git a/installation/language/sy-IQ/sy-IQ.ini b/installation/language/sy-IQ/sy-IQ.ini
index f2f214321c3d4..3f8138d660922 100644
--- a/installation/language/sy-IQ/sy-IQ.ini
+++ b/installation/language/sy-IQ/sy-IQ.ini
@@ -87,7 +87,7 @@ INSTL_SAMPLE_LEARN_SET="ܠܘܦ ܓ̰ܘܡܐ ܐܢܓܠܣ (GB) ܛܘܦ̮ܣ̈ܐ ܕܡܘ
 INSTL_SAMPLE_TESTING_SET="ܨܚܨܝ ܠܐܢܓܠܣ (GB) ܛܘܦ̮ܣܐ ܕܡܘܕܥܢܘܢܘܬܐ"
 INSTL_SITE_INSTALL_SAMPLE_NONE_DESC="ܢܨܘܒ݂ ܓ̰ܘܡܠܐ ܐܚܟ̰ܝ ܒܚܕܐ ܠܘܚܝܬܐ ܘ ܩܠܒ݂ܐ ܕܥܒ݂ܪܬܐ, ܕܠܐ ܚܕ ܚܘܫܒܘܢܐ."
 INSTL_SAMPLE_BLOG_SET_DESC="ܢܨܘܒ݂ ܓ̰ܘܡܠܐ ܥܡ ܚܕܟܡܐ ܡܐܡܪ̈ܐ ܘ ܡܘܕܘܠ̈ܐ ܠܒܝܬܘܬܐ ܕܒܠܘܓܐ ܐܝܟ݂ ܫܕܪ̈ܝܬܐ ܥܬܝܩ̈ܐ, ܓܪܐ ܕܒܠܘܓܐ, ܐܢܝ ܫܕܪ̈ܝܬܐ ܒܫ ܩܪ̈ܝܐ."
-INSTL_SAMPLE_BROCHURE_SET_DESC="ܢܨܘܒ݂ ܓ̰ܘܡܠܐ ܥܡ ܚܕܟܡܐ ܦܬܘܬ̈ܐ (ܚܕܐ ܠܘܚܝܬܐ ܥܡ ܒܝܬܐ ܕܦܬܘܬ̈ܐ, ܒܘܬ ܕܝܢ, ܛܒ̈ܐ, ܡܘܛܝܐ ܥܡܢ) ܘܡܘܕܘܠ̈ܐ ܐܝܟܼ ܒܨܝܐ, ܠܚܝܡܐ HTML, ܩܠܒ݂ܐ ܕܥܒ݂ܪܬܐ."
+INSTL_SAMPLE_BROCHURE_SET_DESC="ܢܨܘܒ݂ ܓ̰ܘܡܠܐ ܥܡ ܚܕܟܡܐ ܦܬܘܬ̈ܐ (ܚܕܐ ܠܘܚܝܬܐ ܥܡ ܒܝܬܐ ܕܦܬܘܬ̈ܐ, ܒܘܬ ܕܝܢ, ܛܒ̈ܐ, ܡܘܛܝܐ ܥܡܢ) ܘܡܘܕܘܠ̈ܐ ܐܝܟܼ ܒܨܝܐ, ܠܚܝܡܐ, ܩܠܒ݂ܐ ܕܥܒ݂ܪܬܐ."
 INSTL_SAMPLE_DATA_SET_DESC="ܢܨܘܒ݂ ܓ̰ܘܡܠܐ ܥܡ ܚܕܐ ܦܬܐ (ܚܕܐ ܠܘܚܝܬܐ ܥܡ ܚܕ ܐܣܪܐ) ܘܡܘܕܘܠܐ ܐܝܟ݂ ܡܐܡܪܐ ܚܪܝܐ، ܩܠܒ݂ܐ ܕܥܒ݂ܪܬܐ"
 INSTL_SAMPLE_LEARN_SET_DESC="ܢܨܘܒ݂ ܓ̰ܘܡܐ ܥܡ ܡܐܡܪ̈ܐ ܕܛܘܦ̮ܣܐ ܐܢܝ ܕܬܢܘܝܐ ܝܠܗ ܕܐܟ݂ܝ ܓ̰ܘܡܠܐ ܒܦܠܚܐ ܝܠܗ."
 INSTL_SAMPLE_TESTING_SET_DESC="ܢܨܘܒ݂ ܓ̰ܘܡܠܐ ܥܡ ܟܠܝܗܝ ܐܣܛܘܟ݂ܣ̈ܐ ܡܬܡܨܝܢ̈ܐ ܕܠܘܚܝܬܐ ܕܥܕܪܢ ܠܢܘܣܝܐ ܕܓ̰ܘܡܠܐ."
diff --git a/installation/language/sy-IQ/sy-IQ.xml b/installation/language/sy-IQ/sy-IQ.xml
index 7db41b3c9655b..7e5b430face88 100644
--- a/installation/language/sy-IQ/sy-IQ.xml
+++ b/installation/language/sy-IQ/sy-IQ.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <metafile
-	version="3.2"
+	version="3.5"
 	client="installation">
 	<name>Syriac (sy-IQ)</name>
-	<version>3.2.0</version>
+	<version>3.5.0</version>
 	<creationDate>2012-09-25</creationDate>
 	<author>East Syriac Translation Team</author>
 	<copyright>Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved.</copyright>

From e58ce4e4d156421b04f56f28d2978d3d981a106a Mon Sep 17 00:00:00 2001
From: Horus68 <pauloizidoro@gmail.com>
Date: Thu, 19 Nov 2015 19:56:56 +0000
Subject: [PATCH 127/176] \n new line code

changed /n to \n in PLG_SYSTEM_UPDATENOTIFICATION_EMAIL_BODY
---
 .../language/en-GB/en-GB.plg_system_updatenotification.ini      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/administrator/language/en-GB/en-GB.plg_system_updatenotification.ini b/administrator/language/en-GB/en-GB.plg_system_updatenotification.ini
index 7ff58ca2bee7e..f4d2dcc3f148d 100644
--- a/administrator/language/en-GB/en-GB.plg_system_updatenotification.ini
+++ b/administrator/language/en-GB/en-GB.plg_system_updatenotification.ini
@@ -17,5 +17,5 @@ PLG_SYSTEM_UPDATENOTIFICATION_LANGUAGE_OVERRIDE_NONE="Auto"
 ; [LINK]			Update URL (link to com_joomlaupdate, will request login if the Super User isn't already logged in).
 ; \n				Newline character. Use it to start a new line in the email.
 PLG_SYSTEM_UPDATENOTIFICATION_EMAIL_SUBJECT="Joomla! Update available for [SITENAME] – [URL]"
-PLG_SYSTEM_UPDATENOTIFICATION_EMAIL_BODY="This email IS NOT sent by Joomla.org. It is sent automatically by your own site,\n[SITENAME]\n\n================================================================================\nUPDATE INFORMATION\n================================================================================\n\nYour site has discovered that there is an updated version of Joomla! available for download.\n\nJoomla! version currently installed:        [CURVERSION]\nJoomla! version available for installation: [NEWVERSION]\n\nThis email is sent to you by your site to remind you of this fact./nThe Joomla! project will never contact you directly about available updates of Joomla! on your site.\n\n================================================================================\nUPDATE INSTRUCTIONS\n================================================================================\n\nTo install the update on [SITENAME] please click the following link. (If the URL is not a link, simply copy & paste it to your browser).\n\nUpdate link: [LINK]\n\n================================================================================\nWHY AM I RECEIVING THIS EMAIL?\n================================================================================\n\nThis email has been automatically sent by a plugin provided by Joomla!, the software which powers your site.\nThis plugin looks for updated versions of Joomla! and sends an email notification to its administrators.\nYou will receive several similar emails from your site until you either update the software or disable these emails.\n\nTo disable these emails, please unpublish the 'System - Joomla! Update Notification' plugin in the Plugin Manager on your site.\n\nIf you do not understand what is Joomla! and what you need to do please do not contact the Joomla! project.\nThey are NOT sending you this email and they cannot help you. Instead, please contact the person who built or manages your site.\n\nIf you are the person who built or manages your website, please note that this plugin may have been activated automatically when you installed or updated Joomla! on your site.\n\n================================================================================\nWHO SENT ME THIS EMAIL?\n================================================================================\n\nThis email is sent to you by your own site, [SITENAME]"
+PLG_SYSTEM_UPDATENOTIFICATION_EMAIL_BODY="This email IS NOT sent by Joomla.org. It is sent automatically by your own site,\n[SITENAME]\n\n================================================================================\nUPDATE INFORMATION\n================================================================================\n\nYour site has discovered that there is an updated version of Joomla! available for download.\n\nJoomla! version currently installed:        [CURVERSION]\nJoomla! version available for installation: [NEWVERSION]\n\nThis email is sent to you by your site to remind you of this fact.\nThe Joomla! project will never contact you directly about available updates of Joomla! on your site.\n\n================================================================================\nUPDATE INSTRUCTIONS\n================================================================================\n\nTo install the update on [SITENAME] please click the following link. (If the URL is not a link, simply copy & paste it to your browser).\n\nUpdate link: [LINK]\n\n================================================================================\nWHY AM I RECEIVING THIS EMAIL?\n================================================================================\n\nThis email has been automatically sent by a plugin provided by Joomla!, the software which powers your site.\nThis plugin looks for updated versions of Joomla! and sends an email notification to its administrators.\nYou will receive several similar emails from your site until you either update the software or disable these emails.\n\nTo disable these emails, please unpublish the 'System - Joomla! Update Notification' plugin in the Plugin Manager on your site.\n\nIf you do not understand what is Joomla! and what you need to do please do not contact the Joomla! project.\nThey are NOT sending you this email and they cannot help you. Instead, please contact the person who built or manages your site.\n\nIf you are the person who built or manages your website, please note that this plugin may have been activated automatically when you installed or updated Joomla! on your site.\n\n================================================================================\nWHO SENT ME THIS EMAIL?\n================================================================================\n\nThis email is sent to you by your own site, [SITENAME]"
 PLG_SYSTEM_UPDATENOTIFICATION_XML_DESCRIPTION="This plugin periodically checks for the availability of new Joomla! versions. When one is found it will send you an email, reminding you to update Joomla!. Pro Tip: You can customise the email message by overriding the language string keys PLG_SYSTEM_UPDATENOTIFICATION_EMAIL_SUBJECT and PLG_SYSTEM_UPDATENOTIFICATION_EMAIL_BODY."

From aae307c8aa66fc5e965b215918942394f2eb20d3 Mon Sep 17 00:00:00 2001
From: matrikular <kontakt@sven-hurt.de>
Date: Fri, 20 Nov 2015 00:39:31 +0100
Subject: [PATCH 128/176] Remove StringHelper dependency and add check to
 fieldset rendering

---
 .../com_contact/views/contact/tmpl/default_form.php   | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/components/com_contact/views/contact/tmpl/default_form.php b/components/com_contact/views/contact/tmpl/default_form.php
index 7cc18157c1039..efc0024d8f9aa 100644
--- a/components/com_contact/views/contact/tmpl/default_form.php
+++ b/components/com_contact/views/contact/tmpl/default_form.php
@@ -9,18 +9,21 @@
 
 defined('_JEXEC') or die;
 
-use \Joomla\String\StringHelper;
-
 JHtml::_('behavior.keepalive');
 JHtml::_('behavior.formvalidator');
+
+$captchaEnabled = (JFactory::getApplication()->get('captcha', '0') !== '0' && !empty(JPluginHelper::getPlugin('captcha')));
 ?>
 <div class="contact-form">
 	<form id="contact-form" action="<?php echo JRoute::_('index.php'); ?>" method="post" class="form-validate form-horizontal well">
-		<?php foreach ($this->form->getFieldsets() as $fieldset) : ?>
+		<?php foreach ($this->form->getFieldsets() as $fieldset): ?>
+			<?php if ($fieldset->name === 'captcha' && !$captchaEnabled) : ?>
+				<?php continue; ?>
+			<?php endif; ?>
 			<?php $fields = $this->form->getFieldset($fieldset->name); ?>
 			<?php if (count($fields)) : ?>
 				<fieldset>
-					<?php if (isset($fieldset->label) && StringHelper::strlen($legend = trim(JText::_($fieldset->label)))) : ?>
+					<?php if (isset($fieldset->label) && strlen($legend = trim(JText::_($fieldset->label)))) : ?>
 						<legend><?php echo $legend; ?></legend>
 					<?php endif; ?>
 					<?php foreach ($fields as $field) : ?>

From 9dca8c669d7bfcd005a12938852acb3ac5f4a2ef Mon Sep 17 00:00:00 2001
From: Dimitri Grammatikogianni <mit505@upshift.gr>
Date: Fri, 20 Nov 2015 18:20:53 +0200
Subject: [PATCH 129/176] Improve travis

- Stop running PHPCS for every php version
---
 .travis.yml | 37 ++++++++++++++++++++++++-------------
 1 file changed, 24 insertions(+), 13 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 10837ae2ab437..298c7c77e2b62 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,12 +3,24 @@ sudo: false
 
 language: php
 
-php:
-  - 5.3
-  - 5.4
-  - 5.5
-  - 5.6
-  - 7.0
+env:
+  global:
+    - RUN_PHPCS="no"
+    - INSTALL_MEMCACHED="yes"
+    - INSTALL_REDIS="yes"
+
+matrix:
+  include:
+    - php: 5.3
+      env: INSTALL_APC="yes"
+    - php: 5.4
+      env: INSTALL_APC="yes"
+    - php: 5.5
+      env: INSTALL_APCU_STABLE="yes"
+    - php: 5.6
+      env: RUN_PHPCS="yes" INSTALL_APCU_STABLE="yes"
+    - php: 7.0
+      env: INSTALL_APCU_BETA="yes" INSTALL_MEMCACHED="no" INSTALL_REDIS="no"
 
 services:
   - memcached
@@ -25,16 +37,15 @@ before_script:
   # Set up Apache
   # - ./build/travis/php-apache.sh
   # Enable additional PHP extensions
-  - if [ $TRAVIS_PHP_VERSION != "7.0" ]; then phpenv config-add build/travis/phpenv/memcached.ini; fi
-  # PHP 5.3 and 5.4 use APC
-  - if [ $TRAVIS_PHP_VERSION == "5.3" ] || [ $TRAVIS_PHP_VERSION == "5.4" ]; then phpenv config-add build/travis/phpenv/apc-$TRAVIS_PHP_VERSION.ini; fi
-  # PHP 5.5+ use APCu
-  - if [ $TRAVIS_PHP_VERSION == "5.5" ] || [ $TRAVIS_PHP_VERSION == "5.6" ]; then printf "\n" | pecl install apcu-beta; fi
-  - if [ $TRAVIS_PHP_VERSION != "7.0" ]; then phpenv config-add build/travis/phpenv/redis.ini; fi
+  - if [ "$INSTALL_MEMCACHED" == "yes" ]; then phpenv config-add build/travis/phpenv/memcached.ini; fi
+  - if [ "$INSTALL_APC" == "yes" ]; then phpenv config-add build/travis/phpenv/apc-$TRAVIS_PHP_VERSION.ini; fi
+  - if [ "$INSTALL_APCU_STABLE" == "yes" ]; then printf "\n" | pecl install apcu; fi
+  - if [ "$INSTALL_APCU_BETA" == "yes" ]; then printf "\n" | pecl install apcu-beta; fi
+  - if [ "$INSTALL_REDIS" == "yes" ]; then phpenv config-add build/travis/phpenv/redis.ini; fi
 
 script:
   - libraries/vendor/bin/phpunit --configuration travisci-phpunit.xml
-  - if [ $TRAVIS_PHP_VERSION != "7.0" ]; then libraries/vendor/bin/phpcs --report=full --extensions=php -p --standard=build/phpcs/Joomla .; fi
+  - if [ "$RUN_PHPCS" == "yes" ]; then libraries/vendor/bin/phpcs --report=full --extensions=php -p --standard=build/phpcs/Joomla .; fi
 
 branches:
   except:

From a16cc179fbb7d2d4f8e8253c70e4d9ff9143c24d Mon Sep 17 00:00:00 2001
From: matrikular <kontakt@sven-hurt.de>
Date: Fri, 20 Nov 2015 20:50:43 +0100
Subject: [PATCH 130/176] Change method of how to determine if captcha was
 enabled

---
 .../com_contact/views/contact/tmpl/default_form.php   | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/components/com_contact/views/contact/tmpl/default_form.php b/components/com_contact/views/contact/tmpl/default_form.php
index efc0024d8f9aa..e30e963ff73e6 100644
--- a/components/com_contact/views/contact/tmpl/default_form.php
+++ b/components/com_contact/views/contact/tmpl/default_form.php
@@ -12,7 +12,16 @@
 JHtml::_('behavior.keepalive');
 JHtml::_('behavior.formvalidator');
 
-$captchaEnabled = (JFactory::getApplication()->get('captcha', '0') !== '0' && !empty(JPluginHelper::getPlugin('captcha')));
+$captchaEnabled = false;
+
+foreach (JPluginHelper::getPlugin('captcha') as $plugin)
+{
+	if (JFactory::getApplication()->get('captcha', '0') === $plugin->name)
+	{
+		$captchaEnabled = true;
+		break;
+	}
+}
 ?>
 <div class="contact-form">
 	<form id="contact-form" action="<?php echo JRoute::_('index.php'); ?>" method="post" class="form-validate form-horizontal well">

From 374ce765e4ba7596439c1c37a2809be571d60915 Mon Sep 17 00:00:00 2001
From: Thomas Hunziker <werbemails@bakual.ch>
Date: Sat, 21 Nov 2015 16:55:58 +0100
Subject: [PATCH 131/176] Add comments about output source.

---
 components/com_content/views/article/tmpl/default.php    | 3 +++
 components/com_content/views/category/tmpl/blog_item.php | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/components/com_content/views/article/tmpl/default.php b/components/com_content/views/article/tmpl/default.php
index 38f1237b12c84..42c67a75d51f9 100644
--- a/components/com_content/views/article/tmpl/default.php
+++ b/components/com_content/views/article/tmpl/default.php
@@ -83,7 +83,9 @@
 		<?php echo $this->item->tagLayout->render($this->item->tags->itemTags); ?>
 	<?php endif; ?>
 
+	<?php // Content is generated by plugin event "onContentAfterTitle" ?>
 	<?php if (!$params->get('show_intro')) : echo $this->item->event->afterDisplayTitle; endif; ?>
+	<?php // Content is generated by plugin event "onContentBeforeDisplay" ?>
 	<?php echo $this->item->event->beforeDisplayContent; ?>
 
 	<?php if (isset($urls) && ((!empty($urls->urls_position) && ($urls->urls_position == '0')) || ($params->get('urls_position') == '0' && empty($urls->urls_position)))
@@ -163,5 +165,6 @@
 		echo $this->item->pagination;
 	?>
 	<?php endif; ?>
+	<?php // Content is generated by plugin event "onContentAfterDisplay" ?>
 	<?php echo $this->item->event->afterDisplayContent; ?>
 </div>
diff --git a/components/com_content/views/category/tmpl/blog_item.php b/components/com_content/views/category/tmpl/blog_item.php
index dbfc4b228d7b3..05dab5f8edd3b 100644
--- a/components/com_content/views/category/tmpl/blog_item.php
+++ b/components/com_content/views/category/tmpl/blog_item.php
@@ -42,8 +42,10 @@
 
 
 <?php if (!$params->get('show_intro')) : ?>
+	<?php // Content is generated by plugin event "onContentAfterTitle" ?>
 	<?php echo $this->item->event->afterDisplayTitle; ?>
 <?php endif; ?>
+<?php // Content is generated by plugin event "onContentBeforeDisplay" ?>
 <?php echo $this->item->event->beforeDisplayContent; ?> <?php echo $this->item->introtext; ?>
 
 <?php if ($useDefList && ($info == 1 || $info == 2)) : ?>
@@ -70,4 +72,5 @@
 </div>
 <?php endif; ?>
 
+<?php // Content is generated by plugin event "onContentAfterDisplay" ?>
 <?php echo $this->item->event->afterDisplayContent; ?>

From 4040f6a7b3f155631ed9b99d87123f8248f999cd Mon Sep 17 00:00:00 2001
From: Thomas Hunziker <werbemails@bakual.ch>
Date: Sat, 21 Nov 2015 19:30:52 +0100
Subject: [PATCH 132/176] Add comments also to the other views.

---
 .../com_content/views/archive/tmpl/default_items.php   |  3 +++
 components/com_content/views/article/tmpl/default.php  |  6 +++---
 .../com_content/views/category/tmpl/blog_item.php      | 10 ++++++----
 .../com_content/views/featured/tmpl/default_item.php   |  7 ++++++-
 components/com_tags/views/tag/tmpl/default_items.php   |  3 +++
 5 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/components/com_content/views/archive/tmpl/default_items.php b/components/com_content/views/archive/tmpl/default_items.php
index bade1eea7b775..825a592047159 100644
--- a/components/com_content/views/archive/tmpl/default_items.php
+++ b/components/com_content/views/archive/tmpl/default_items.php
@@ -123,8 +123,10 @@
 		<?php endif; ?>
 
 		<?php if (!$params->get('show_intro')) : ?>
+			<?php // Content is generated by content plugin event "onContentAfterTitle" ?>
 			<?php echo $item->event->afterDisplayTitle; ?>
 		<?php endif; ?>
+		<?php // Content is generated by content plugin event "onContentBeforeDisplay" ?>
 		<?php echo $item->event->beforeDisplayContent; ?>
 		<?php if ($params->get('show_intro')) :?>
 			<div class="intro" itemprop="articleBody"> <?php echo JHtml::_('string.truncateComplex', $item->introtext, $params->get('introtext_limit')); ?> </div>
@@ -206,6 +208,7 @@
 			</dl>
 		</div>
 		<?php endif; ?>
+		<?php // Content is generated by content plugin event "onContentAfterDisplay" ?>
 		<?php echo $item->event->afterDisplayContent; ?>
 	</div>
 	<?php endforeach; ?>
diff --git a/components/com_content/views/article/tmpl/default.php b/components/com_content/views/article/tmpl/default.php
index 42c67a75d51f9..ea84fc8fbb72d 100644
--- a/components/com_content/views/article/tmpl/default.php
+++ b/components/com_content/views/article/tmpl/default.php
@@ -83,9 +83,9 @@
 		<?php echo $this->item->tagLayout->render($this->item->tags->itemTags); ?>
 	<?php endif; ?>
 
-	<?php // Content is generated by plugin event "onContentAfterTitle" ?>
+	<?php // Content is generated by content plugin event "onContentAfterTitle" ?>
 	<?php if (!$params->get('show_intro')) : echo $this->item->event->afterDisplayTitle; endif; ?>
-	<?php // Content is generated by plugin event "onContentBeforeDisplay" ?>
+	<?php // Content is generated by content plugin event "onContentBeforeDisplay" ?>
 	<?php echo $this->item->event->beforeDisplayContent; ?>
 
 	<?php if (isset($urls) && ((!empty($urls->urls_position) && ($urls->urls_position == '0')) || ($params->get('urls_position') == '0' && empty($urls->urls_position)))
@@ -165,6 +165,6 @@
 		echo $this->item->pagination;
 	?>
 	<?php endif; ?>
-	<?php // Content is generated by plugin event "onContentAfterDisplay" ?>
+	<?php // Content is generated by content plugin event "onContentAfterDisplay" ?>
 	<?php echo $this->item->event->afterDisplayContent; ?>
 </div>
diff --git a/components/com_content/views/category/tmpl/blog_item.php b/components/com_content/views/category/tmpl/blog_item.php
index 05dab5f8edd3b..e3afd0a115157 100644
--- a/components/com_content/views/category/tmpl/blog_item.php
+++ b/components/com_content/views/category/tmpl/blog_item.php
@@ -42,11 +42,13 @@
 
 
 <?php if (!$params->get('show_intro')) : ?>
-	<?php // Content is generated by plugin event "onContentAfterTitle" ?>
+	<?php // Content is generated by content plugin event "onContentAfterTitle" ?>
 	<?php echo $this->item->event->afterDisplayTitle; ?>
 <?php endif; ?>
-<?php // Content is generated by plugin event "onContentBeforeDisplay" ?>
-<?php echo $this->item->event->beforeDisplayContent; ?> <?php echo $this->item->introtext; ?>
+<?php // Content is generated by content plugin event "onContentBeforeDisplay" ?>
+<?php echo $this->item->event->beforeDisplayContent; ?>
+
+<?php echo $this->item->introtext; ?>
 
 <?php if ($useDefList && ($info == 1 || $info == 2)) : ?>
 	<?php echo JLayoutHelper::render('joomla.content.info_block.block', array('item' => $this->item, 'params' => $params, 'position' => 'below')); ?>
@@ -72,5 +74,5 @@
 </div>
 <?php endif; ?>
 
-<?php // Content is generated by plugin event "onContentAfterDisplay" ?>
+<?php // Content is generated by content plugin event "onContentAfterDisplay" ?>
 <?php echo $this->item->event->afterDisplayContent; ?>
diff --git a/components/com_content/views/featured/tmpl/default_item.php b/components/com_content/views/featured/tmpl/default_item.php
index 048ac1ab186d1..d087b22951711 100644
--- a/components/com_content/views/featured/tmpl/default_item.php
+++ b/components/com_content/views/featured/tmpl/default_item.php
@@ -66,9 +66,13 @@
 <?php endif; ?>
 
 <?php if (!$params->get('show_intro')) : ?>
+	<?php // Content is generated by content plugin event "onContentAfterTitle" ?>
 	<?php echo $this->item->event->afterDisplayTitle; ?>
 <?php endif; ?>
-<?php echo $this->item->event->beforeDisplayContent; ?> <?php echo $this->item->introtext; ?>
+<?php // Content is generated by content plugin event "onContentBeforeDisplay" ?>
+<?php echo $this->item->event->beforeDisplayContent; ?>
+
+<?php echo $this->item->introtext; ?>
 
 <?php if ($useDefList && ($info == 1 || $info == 2)) : ?>
 	<?php echo JLayoutHelper::render('joomla.content.info_block.block', array('item' => $this->item, 'params' => $params, 'position' => 'below')); ?>
@@ -97,4 +101,5 @@
 	</div>
 <?php endif; ?>
 
+<?php // Content is generated by content plugin event "onContentAfterDisplay" ?>
 <?php echo $this->item->event->afterDisplayContent; ?>
diff --git a/components/com_tags/views/tag/tmpl/default_items.php b/components/com_tags/views/tag/tmpl/default_items.php
index 92322c66fd381..fb9fd8261de1c 100644
--- a/components/com_tags/views/tag/tmpl/default_items.php
+++ b/components/com_tags/views/tag/tmpl/default_items.php
@@ -71,6 +71,7 @@
 					</a>
 				</h3>
 			<?php endif; ?>
+			<?php // Content is generated by content plugin event "onContentAfterTitle" ?>
 			<?php echo $item->event->afterDisplayTitle; ?>
 			<?php $images  = json_decode($item->core_images);?>
 			<?php if ($this->params->get('tag_list_show_item_image', 1) == 1 && !empty($images->image_intro)) :?>
@@ -79,10 +80,12 @@
 				</a>
 			<?php endif; ?>
 			<?php if ($this->params->get('tag_list_show_item_description', 1)) : ?>
+				<?php // Content is generated by content plugin event "onContentBeforeDisplay" ?>
 				<?php echo $item->event->beforeDisplayContent; ?>
 				<span class="tag-body">
 					<?php echo JHtml::_('string.truncate', $item->core_body, $this->params->get('tag_list_item_maximum_characters')); ?>
 				</span>
+				<?php // Content is generated by content plugin event "onContentAfterDisplay" ?>
 				<?php echo $item->event->afterDisplayContent; ?>
 			<?php endif; ?>
 				</li>

From e10539dd3786422c6fd50228f855738b57cf0938 Mon Sep 17 00:00:00 2001
From: andrepereirasilva <andrepereirasilva>
Date: Sun, 22 Nov 2015 09:05:52 +0000
Subject: [PATCH 133/176] REplace http for hrrps in schema.org microdata

---
 .../com_contact/views/contact/tmpl/default_address.php    | 2 +-
 .../com_contact/views/featured/tmpl/default_items.php     | 8 ++++----
 .../com_content/views/archive/tmpl/default_items.php      | 4 ++--
 components/com_content/views/article/tmpl/default.php     | 2 +-
 components/com_content/views/category/tmpl/blog.php       | 6 +++---
 components/com_content/views/featured/tmpl/default.php    | 6 +++---
 layouts/joomla/content/info_block/author.php              | 2 +-
 libraries/joomla/microdata/microdata.php                  | 2 +-
 modules/mod_articles_latest/tmpl/default.php              | 2 +-
 modules/mod_breadcrumbs/tmpl/default.php                  | 6 +++---
 plugins/content/vote/vote.php                             | 2 +-
 11 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/components/com_contact/views/contact/tmpl/default_address.php b/components/com_contact/views/contact/tmpl/default_address.php
index 2e628c38e72e7..1b4635422550d 100644
--- a/components/com_contact/views/contact/tmpl/default_address.php
+++ b/components/com_contact/views/contact/tmpl/default_address.php
@@ -14,7 +14,7 @@
  * jicon-text, jicon-none, jicon-icon
  */
 ?>
-<dl class="contact-address dl-horizontal" itemprop="address" itemscope itemtype="http://schema.org/PostalAddress">
+<dl class="contact-address dl-horizontal" itemprop="address" itemscope itemtype="https://schema.org/PostalAddress">
 	<?php if (($this->params->get('address_check') > 0) &&
 		($this->contact->address || $this->contact->suburb  || $this->contact->state || $this->contact->country || $this->contact->postcode)) : ?>
 		<?php if ($this->params->get('address_check') > 0) : ?>
diff --git a/components/com_contact/views/featured/tmpl/default_items.php b/components/com_contact/views/featured/tmpl/default_items.php
index 3b7eb479e71bc..8351ee8976d99 100644
--- a/components/com_contact/views/featured/tmpl/default_items.php
+++ b/components/com_contact/views/featured/tmpl/default_items.php
@@ -95,7 +95,7 @@
 
 		<tbody>
 			<?php foreach ($this->items as $i => $item) : ?>
-				<tr class="<?php echo ($i % 2) ? "odd" : "even"; ?>" itemscope itemtype="http://schema.org/Person">
+				<tr class="<?php echo ($i % 2) ? "odd" : "even"; ?>" itemscope itemtype="https://schema.org/Person">
 					<td class="item-num">
 						<?php echo $i; ?>
 					</td>
@@ -140,19 +140,19 @@
 					<?php endif; ?>
 
 					<?php if ($this->params->get('show_suburb_headings')) : ?>
-						<td class="item-suburb" itemprop="address" itemscope itemtype="http://schema.org/PostalAddress">
+						<td class="item-suburb" itemprop="address" itemscope itemtype="https://schema.org/PostalAddress">
 							<span itemprop="addressLocality"><?php echo $item->suburb; ?></span>
 						</td>
 					<?php endif; ?>
 
 					<?php if ($this->params->get('show_state_headings')) : ?>
-						<td class="item-state" itemprop="address" itemscope itemtype="http://schema.org/PostalAddress">
+						<td class="item-state" itemprop="address" itemscope itemtype="https://schema.org/PostalAddress">
 							<span itemprop="addressRegion"><?php echo $item->state; ?></span>
 						</td>
 					<?php endif; ?>
 
 					<?php if ($this->params->get('show_country_headings')) : ?>
-						<td class="item-state" itemprop="address" itemscope itemtype="http://schema.org/PostalAddress">
+						<td class="item-state" itemprop="address" itemscope itemtype="https://schema.org/PostalAddress">
 							<span itemprop="addressCountry"><?php echo $item->country; ?></span>
 						</td>
 					<?php endif; ?>
diff --git a/components/com_content/views/archive/tmpl/default_items.php b/components/com_content/views/archive/tmpl/default_items.php
index bade1eea7b775..a1815453cd8dc 100644
--- a/components/com_content/views/archive/tmpl/default_items.php
+++ b/components/com_content/views/archive/tmpl/default_items.php
@@ -16,7 +16,7 @@
 <div id="archive-items">
 	<?php foreach ($this->items as $i => $item) : ?>
 		<?php $info = $item->params->get('info_block_position', 0); ?>
-		<div class="row<?php echo $i % 2; ?>" itemscope itemtype="http://schema.org/Article">
+		<div class="row<?php echo $i % 2; ?>" itemscope itemtype="https://schema.org/Article">
 			<div class="page-header">
 				<h2 itemprop="name">
 					<?php if ($params->get('link_titles')) : ?>
@@ -28,7 +28,7 @@
 					<?php endif; ?>
 				</h2>
 				<?php if ($params->get('show_author') && !empty($item->author )) : ?>
-					<div class="createdby" itemprop="author" itemscope itemtype="http://schema.org/Person">
+					<div class="createdby" itemprop="author" itemscope itemtype="https://schema.org/Person">
 					<?php $author = ($item->created_by_alias) ? $item->created_by_alias : $item->author; ?>
 					<?php $author = '<span itemprop="name">' . $author . '</span>'; ?>
 						<?php if (!empty($item->contact_link) && $params->get('link_author') == true) : ?>
diff --git a/components/com_content/views/article/tmpl/default.php b/components/com_content/views/article/tmpl/default.php
index 38f1237b12c84..e07e589a2dc38 100644
--- a/components/com_content/views/article/tmpl/default.php
+++ b/components/com_content/views/article/tmpl/default.php
@@ -20,7 +20,7 @@
 $info    = $params->get('info_block_position', 0);
 JHtml::_('behavior.caption');
 ?>
-<div class="item-page<?php echo $this->pageclass_sfx; ?>" itemscope itemtype="http://schema.org/Article">
+<div class="item-page<?php echo $this->pageclass_sfx; ?>" itemscope itemtype="https://schema.org/Article">
 	<meta itemprop="inLanguage" content="<?php echo ($this->item->language === '*') ? JFactory::getConfig()->get('language') : $this->item->language; ?>" />
 	<?php if ($this->params->get('show_page_heading')) : ?>
 	<div class="page-header">
diff --git a/components/com_content/views/category/tmpl/blog.php b/components/com_content/views/category/tmpl/blog.php
index 8a5bb822cbe49..e471dce34bff4 100644
--- a/components/com_content/views/category/tmpl/blog.php
+++ b/components/com_content/views/category/tmpl/blog.php
@@ -13,7 +13,7 @@
 
 JHtml::_('behavior.caption');
 ?>
-<div class="blog<?php echo $this->pageclass_sfx; ?>" itemscope itemtype="http://schema.org/Blog">
+<div class="blog<?php echo $this->pageclass_sfx; ?>" itemscope itemtype="https://schema.org/Blog">
 	<?php if ($this->params->get('show_page_heading')) : ?>
 		<div class="page-header">
 			<h1> <?php echo $this->escape($this->params->get('page_heading')); ?> </h1>
@@ -55,7 +55,7 @@
 		<div class="items-leading clearfix">
 			<?php foreach ($this->lead_items as &$item) : ?>
 				<div class="leading-<?php echo $leadingcount; ?><?php echo $item->state == 0 ? ' system-unpublished' : null; ?>"
-					itemprop="blogPost" itemscope itemtype="http://schema.org/BlogPosting">
+					itemprop="blogPost" itemscope itemtype="https://schema.org/BlogPosting">
 					<?php
 					$this->item = & $item;
 					echo $this->loadTemplate('item');
@@ -80,7 +80,7 @@
 			<?php endif; ?>
 			<div class="span<?php echo round((12 / $this->columns)); ?>">
 				<div class="item column-<?php echo $rowcount; ?><?php echo $item->state == 0 ? ' system-unpublished' : null; ?>"
-					itemprop="blogPost" itemscope itemtype="http://schema.org/BlogPosting">
+					itemprop="blogPost" itemscope itemtype="https://schema.org/BlogPosting">
 					<?php
 					$this->item = & $item;
 					echo $this->loadTemplate('item');
diff --git a/components/com_content/views/featured/tmpl/default.php b/components/com_content/views/featured/tmpl/default.php
index 884da2a465fda..ea0de2aea1637 100644
--- a/components/com_content/views/featured/tmpl/default.php
+++ b/components/com_content/views/featured/tmpl/default.php
@@ -16,7 +16,7 @@
 // If the page class is defined, add to class as suffix.
 // It will be a separate class if the user starts it with a space
 ?>
-<div class="blog-featured<?php echo $this->pageclass_sfx;?>" itemscope itemtype="http://schema.org/Blog">
+<div class="blog-featured<?php echo $this->pageclass_sfx;?>" itemscope itemtype="https://schema.org/Blog">
 <?php if ($this->params->get('show_page_heading') != 0) : ?>
 <div class="page-header">
 	<h1>
@@ -30,7 +30,7 @@
 <div class="items-leading clearfix">
 	<?php foreach ($this->lead_items as &$item) : ?>
 		<div class="leading-<?php echo $leadingcount; ?><?php echo $item->state == 0 ? ' system-unpublished' : null; ?> clearfix" 
-			itemprop="blogPost" itemscope itemtype="http://schema.org/BlogPosting">
+			itemprop="blogPost" itemscope itemtype="https://schema.org/BlogPosting">
 			<?php
 				$this->item = &$item;
 				echo $this->loadTemplate('item');
@@ -59,7 +59,7 @@
 		<div class="items-row cols-<?php echo (int) $this->columns;?> <?php echo 'row-' . $row; ?> row-fluid">
 		<?php endif; ?>
 			<div class="item column-<?php echo $rowcount;?><?php echo $item->state == 0 ? ' system-unpublished' : null; ?> span<?php echo round((12 / $this->columns));?>"
-				itemprop="blogPost" itemscope itemtype="http://schema.org/BlogPosting">
+				itemprop="blogPost" itemscope itemtype="https://schema.org/BlogPosting">
 			<?php
 					$this->item = &$item;
 					echo $this->loadTemplate('item');
diff --git a/layouts/joomla/content/info_block/author.php b/layouts/joomla/content/info_block/author.php
index 66b97a9256044..ee8cc01653d87 100644
--- a/layouts/joomla/content/info_block/author.php
+++ b/layouts/joomla/content/info_block/author.php
@@ -10,7 +10,7 @@
 defined('JPATH_BASE') or die;
 
 ?>
-<dd class="createdby" itemprop="author" itemscope itemtype="http://schema.org/Person">
+<dd class="createdby" itemprop="author" itemscope itemtype="https://schema.org/Person">
 	<?php $author = ($displayData['item']->created_by_alias ? $displayData['item']->created_by_alias : $displayData['item']->author); ?>
 	<?php $author = '<span itemprop="name">' . $author . '</span>'; ?>
 	<?php if (!empty($displayData['item']->contact_link ) && $displayData['params']->get('link_author') == true) : ?>
diff --git a/libraries/joomla/microdata/microdata.php b/libraries/joomla/microdata/microdata.php
index 3e761dfedde55..a42ab369694c5 100644
--- a/libraries/joomla/microdata/microdata.php
+++ b/libraries/joomla/microdata/microdata.php
@@ -687,7 +687,7 @@ public static function getExpectedTypes($type, $property)
 	 * Return the expected display type of the [normal|nested|meta]
 	 * In wich way to display the Property:
 	 * normal -> itemprop="name"
-	 * nested -> itemprop="director" itemscope itemtype="http://schema.org/Person"
+	 * nested -> itemprop="director" itemscope itemtype="https://schema.org/Person"
 	 * meta   -> <meta itemprop="datePublished" content="1991-05-01">
 	 *
 	 * @param   string  $type      The Type where to find the Property
diff --git a/modules/mod_articles_latest/tmpl/default.php b/modules/mod_articles_latest/tmpl/default.php
index a616c07340113..ede639929171b 100644
--- a/modules/mod_articles_latest/tmpl/default.php
+++ b/modules/mod_articles_latest/tmpl/default.php
@@ -11,7 +11,7 @@
 ?>
 <ul class="latestnews<?php echo $moduleclass_sfx; ?>">
 <?php foreach ($list as $item) :  ?>
-	<li itemscope itemtype="http://schema.org/Article">
+	<li itemscope itemtype="https://schema.org/Article">
 		<a href="<?php echo $item->link; ?>" itemprop="url">
 			<span itemprop="name">
 				<?php echo $item->title; ?>
diff --git a/modules/mod_breadcrumbs/tmpl/default.php b/modules/mod_breadcrumbs/tmpl/default.php
index 5c77255827974..0857698d225e4 100644
--- a/modules/mod_breadcrumbs/tmpl/default.php
+++ b/modules/mod_breadcrumbs/tmpl/default.php
@@ -12,7 +12,7 @@
 JHtml::_('bootstrap.tooltip');
 ?>
 
-<ul itemscope itemtype="http://schema.org/BreadcrumbList" class="breadcrumb<?php echo $moduleclass_sfx; ?>">
+<ul itemscope itemtype="https://schema.org/BreadcrumbList" class="breadcrumb<?php echo $moduleclass_sfx; ?>">
 	<?php if ($params->get('showHere', 1)) : ?>
 		<li class="active">
 			<?php echo JText::_('MOD_BREADCRUMBS_HERE'); ?>&#160;
@@ -46,7 +46,7 @@
 	foreach ($list as $key => $item) :
 		if ($key != $last_item_key) :
 			// Render all but last item - along with separator ?>
-			<li itemprop="itemListElement" itemscope itemtype="http://schema.org/ListItem">
+			<li itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem">
 				<?php if (!empty($item->link)) : ?>
 					<a itemprop="item" href="<?php echo $item->link; ?>" class="pathway"><span itemprop="name"><?php echo $item->name; ?></span></a>
 				<?php else : ?>
@@ -64,7 +64,7 @@
 			</li>
 		<?php elseif ($show_last) :
 			// Render last item if reqd. ?>
-			<li itemprop="itemListElement" itemscope itemtype="http://schema.org/ListItem" class="active">
+			<li itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem" class="active">
 				<span itemprop="name">
 					<?php echo $item->name; ?>
 				</span>
diff --git a/plugins/content/vote/vote.php b/plugins/content/vote/vote.php
index b0a76f66927a2..580ba8ada4e2d 100644
--- a/plugins/content/vote/vote.php
+++ b/plugins/content/vote/vote.php
@@ -68,7 +68,7 @@ public function onContentBeforeDisplay($context, &$row, &$params, $page=0)
 				$img .= $starImageOff;
 			}
 
-			$html .= '<div class="content_rating" itemprop="aggregateRating" itemscope itemtype="http://schema.org/AggregateRating">';
+			$html .= '<div class="content_rating" itemprop="aggregateRating" itemscope itemtype="https://schema.org/AggregateRating">';
 			$html .= '<p class="unseen element-invisible">'
 					. JText::sprintf('PLG_VOTE_USER_RATING', '<span itemprop="ratingValue">' . $rating . '</span>', '<span itemprop="bestRating">5</span>')
 					. '<meta itemprop="ratingCount" content="' . (int) $row->rating_count . '" />'

From 279f8456fe73927d093075d14e1babaea76e87e7 Mon Sep 17 00:00:00 2001
From: Thomas Hunziker <werbemails@bakual.ch>
Date: Mon, 23 Nov 2015 20:29:15 +0100
Subject: [PATCH 134/176] Updated th-TH installation language files.

---
 installation/language/th-TH/th-TH.ini | 2 +-
 installation/language/th-TH/th-TH.xml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/installation/language/th-TH/th-TH.ini b/installation/language/th-TH/th-TH.ini
index f133feae636df..a69f1d2bcc9a3 100644
--- a/installation/language/th-TH/th-TH.ini
+++ b/installation/language/th-TH/th-TH.ini
@@ -87,7 +87,7 @@ INSTL_SAMPLE_LEARN_SET="ข้อมูลตัวอย่าง เอาไ
 INSTL_SAMPLE_TESTING_SET="ข้อมูลตัวอย่าง ทดสอบ ภาษาอังกฤษ (GB)"
 INSTL_SITE_INSTALL_SAMPLE_NONE_DESC="ติดตั้งจูมล่า โดยมีเพียงแค่เมนู และโมดูลล๊อกอินเข้าสู่ระบบ โดยที่ไม่มีเนื้อหาต่างๆ เลย"
 INSTL_SAMPLE_BLOG_SET_DESC="ติดตั้งจูมล่า โดยมีเนื้อหา และการแสดงผลแบบบล็อก มีโมดูลแสดงเนื้อหาที่เกี่ยวข้อง โมดูลเนื้อหายอดนิยม"
-INSTL_SAMPLE_BROCHURE_SET_DESC="ติดตั้งจูมล่า โดยมีเนื้อหาเป็นหน้าๆ (จะมีเมนู หน้าแรก, เกี่ยวกับเรา, ข่าวสาร, ติดต่อเรา) และโมดูลค้นหา, Custom HTML, โมดูลล๊อกอิน"
+INSTL_SAMPLE_BROCHURE_SET_DESC="ติดตั้งจูมล่า โดยมีเนื้อหาเป็นหน้าๆ (จะมีเมนู หน้าแรก, เกี่ยวกับเรา, ข่าวสาร, ติดต่อเรา) และมีโมดูลค้นหา, โมดูลกำหนดเอง, โมดูลล๊อกอิน"
 INSTL_SAMPLE_DATA_SET_DESC="ติดตั้งจูมล่า โดยมีเนื้อหาหนึ่งหน้า (มีเมนูลิงก์เดียว) และโมดูลที่แสดงเนื้อหาล่าสุด, โมดูลล๊อกอิน"
 INSTL_SAMPLE_LEARN_SET_DESC="ติดตั้งจูมล่า โดยมีเนื้อหาตัวอย่าง โดยจะมีเนื้อหาเกี่ยวกับวิธีการใช้งานจูมล่า"
 INSTL_SAMPLE_TESTING_SET_DESC="ติดตั้งจูมล่า โดยมีลิงก์เมนูทั้งหมด เพื่อช่วยให้ทดสอบการทำงานของจูมล่าได้"
diff --git a/installation/language/th-TH/th-TH.xml b/installation/language/th-TH/th-TH.xml
index 67048422e4296..efa4e280767a0 100644
--- a/installation/language/th-TH/th-TH.xml
+++ b/installation/language/th-TH/th-TH.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <metafile
-	version="3.4"
+	version="3.5"
 	client="installation">
 	<name>Thai ไทย (ภาษาไทย)</name>
-	<version>3.4.4</version>
+	<version>3.5.0</version>
 	<creationDate>August 2015</creationDate>
 	<author>Thai Translation Team</author>
 	<copyright>Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved.</copyright>

From ba0d711a8e37e17d79fce01a3e704460d851a3b3 Mon Sep 17 00:00:00 2001
From: Thomas Hunziker <werbemails@bakual.ch>
Date: Tue, 24 Nov 2015 12:49:05 +0100
Subject: [PATCH 135/176] Adding Esperanto to the installation languages.

---
 installation/language/eo-XX/eo-XX.ini | 322 ++++++++++++++++++++++++++
 installation/language/eo-XX/eo-XX.xml |  23 ++
 2 files changed, 345 insertions(+)
 create mode 100644 installation/language/eo-XX/eo-XX.ini
 create mode 100644 installation/language/eo-XX/eo-XX.xml

diff --git a/installation/language/eo-XX/eo-XX.ini b/installation/language/eo-XX/eo-XX.ini
new file mode 100644
index 0000000000000..6eb300b5292cf
--- /dev/null
+++ b/installation/language/eo-XX/eo-XX.ini
@@ -0,0 +1,322 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt
+; Note : All ini files need to be saved as UTF-8
+
+;Stepbar
+INSTL_STEP_COMPLETE_LABEL="Fino"
+INSTL_STEP_DATABASE_LABEL="Datumbazo"
+INSTL_STEP_DEFAULTLANGUAGE_LABEL="Elekti defaŭltan lingvon"
+INSTL_STEP_FTP_LABEL="FTP"
+INSTL_STEP_LANGUAGES_LABEL="Instali lingvojn"
+INSTL_STEP_SITE_LABEL="Agordo"
+INSTL_STEP_SUMMARY_LABEL="Superrigardo"
+
+;Language view
+INSTL_SELECT_LANGUAGE_TITLE="Elekti lingvon"
+INSTL_WARNJAVASCRIPT="Averto! Ĝavaskripto devas esti ebligita por korekta instalo de Joomla!"
+INSTL_WARNJSON="Via PHP-instalo postulas ebligitan JSON por instalo de Joomla!"
+
+;Preinstall view
+INSTL_PRECHECK_TITLE="Antaŭ-instala kontrolo"
+INSTL_PRECHECK_DESC="Se iu el tiuj ĉi eroj ne estas subtenataj (markitaj <strong class="_QQ_"label label-important"_QQ_">Ne</strong>) bonvolu korekti tion. <br />Vi ne povas instali Joomlan antaŭ la agordoj egalas al la subaj postuloj."
+INSTL_PRECHECK_RECOMMENDED_SETTINGS_TITLE="Rekomenditaj agordoj:"
+INSTL_PRECHECK_RECOMMENDED_SETTINGS_DESC="Tiuj ĉi agordoj estas rekomenditaj por PHP por sekurigi plenan kongruecon kun Joomla.<br />Tamen, Joomla! ankoraŭ funkcios se viaj agordoj ne entute sekvas la rekomenditajn agordojn."
+INSTL_PRECHECK_DIRECTIVE="Direktivo"
+INSTL_PRECHECK_RECOMMENDED="Rekomendita"
+INSTL_PRECHECK_ACTUAL="Efektiva"
+
+; Database view
+INSTL_DATABASE="Datumbaza agordo"
+INSTL_DATABASE_HOST_DESC="Plej ofte "_QQ_"localhost"_QQ_"."
+INSTL_DATABASE_HOST_LABEL="Gastiganta nomo"
+INSTL_DATABASE_NAME_DESC="Kelkaj gastigantoj nur permesas specifan DBan nomon po retejo. Uzu tabelan prefikson tiuokaze por distingi inter la Joomla!jn retejojn."
+INSTL_DATABASE_NAME_LABEL="Datumbaza nomo"
+INSTL_DATABASE_NO_SCHEMA="Neniu datumbaza skemo ekzistas por tiu ĉi datumbaza tipo."
+INSTL_DATABASE_OLD_PROCESS_DESC="Iu ajn ekzistanta tabela savkopio de antaŭaj Joomla!-instaloj estos anstataŭigita."
+INSTL_DATABASE_OLD_PROCESS_LABEL="Malnova datumbaza reĝimo"
+INSTL_DATABASE_PASSWORD_DESC="Pro reteja sekureco uzo de pasvorto por la datumbaza konto nepras."
+INSTL_DATABASE_PASSWORD_LABEL="Pasvorto"
+INSTL_DATABASE_PREFIX_DESC="Elekti tabelan prefikson aŭ uzi la <b>hazarde kreitan</b>. Ideale tri aŭ kvar signojn longa, enhavu nur leterciferajn signojn kaj DEVAS finiĝi per substreko. <b>Kontroli ke la elektita prefikso ne estas uzata por aliaj tabeloj</b>."
+INSTL_DATABASE_PREFIX_LABEL="Tabela prefikso"
+INSTL_DATABASE_PREFIX_MSG="La tabela prefikso devas komenci per letero, sekvata de laŭvolaj leterciferaj signoj kaj substreko"
+INSTL_DATABASE_TYPE_DESC="Plej probable "_QQ_"MySQLi"_QQ_"."
+INSTL_DATABASE_TYPE_LABEL="Tipo de datumbazo"
+INSTL_DATABASE_USER_DESC="Aŭ io simila al "_QQ_"root"_QQ_" aŭ salutnomo donita de la gastiganto."
+INSTL_DATABASE_USER_LABEL="Salutnomo"
+
+;FTP view
+INSTL_AUTOFIND_FTP_PATH="Aŭtomate trovi FTP-vojon"
+INSTL_FTP="FTP-agordoj"
+INSTL_FTP_DESC="<p>Por kelkaj serviloj vi devas provizi ensalutiloj por FTP por kompleta instalo. Se vi havas problemojn instali sen tiuj salutiloj, kontroli ĉe via gastiganto por decidi ĉu ili nepras.</p><p>Pro sekurecaj kialoj, estas plej bone krei apartan FTPan uzantkonton kun nura alirrajto al la Joomla!-instalo, ne al la tuta interreta servilo. Via gastiganto povas helpi vin rilate al tio. </p><p><b>Notu:</b> Se vi instalas en Vindoza operacisistemo, la FTP-tavolo <strong>ne</strong> necesas.</p>"
+INSTL_FTP_ENABLE_LABEL="Ebligi FTP-tavolon"
+INSTL_FTP_HOST_LABEL="FTP-gastiganto"
+INSTL_FTP_PASSWORD_LABEL="FTP-pasvorto"
+INSTL_FTP_PORT_LABEL="FTP-pordo"
+INSTL_FTP_ROOT_LABEL="FTPa radika vojo"
+INSTL_FTP_SAVE_LABEL="Konservi FTPan pasvorton"
+INSTL_FTP_TITLE="FTPa agordo (<strong class="_QQ_"red"_QQ_">Opcia - plej ofte eblas pasi tiun ĉi paŝon - Klaki Sekva por preterpaŝi</strong>)"
+INSTL_FTP_USER_LABEL="FTP-salutnomo"
+INSTL_VERIFY_FTP_SETTINGS="Konfirmi FTP-agordojn"
+INSTL_FTP_SETTINGS_CORRECT="Agordoj korektaj"
+INSTL_FTP_USER_DESC="Averto! Estas rekomendite lasi tion ĉi malplena aŭ entajpi vian FTPan uzantnomon ĉiufoje vi sendas dosierojn."
+INSTL_FTP_PASSWORD_DESC="Averto! Estas rekomendite lasi tion ĉi malplena aŭ entajpi vian FTPan uzantnomon ĉiufoje vi sendas dosierojn."
+
+;Site View
+INSTL_SITE="Ĉefa agordo"
+INSTL_ADMIN_EMAIL_LABEL="Retpoŝto de administranto"
+INSTL_ADMIN_EMAIL_DESC="Entajpu retadreson. Tio estos la retadreson de la ĉefadministranto de la retejo."
+INSTL_ADMIN_PASSWORD_LABEL="Administranta pasvorto"
+INSTL_ADMIN_PASSWORD_DESC="Entajpu la pasvorton por via ĉefadministra konto kaj konfirmu ĝin en la suba kampo."
+INSTL_ADMIN_PASSWORD2_LABEL="Konfirmi pasvorton de administranto"
+INSTL_ADMIN_USER_LABEL="Administranta salutnomo"
+INSTL_ADMIN_USER_DESC="Elekti salutnomon por via Ĉefadministra konto."
+INSTL_SITE_NAME_LABEL="Reteja nomo"
+INSTL_SITE_NAME_DESC="Entajpi la nomon de via Joomla! retejo."
+INSTL_SITE_METADESC_LABEL="Priskribo"
+INSTL_SITE_METADESC_TITLE_LABEL="Entajpi priskribon pri la tuta retejo uzata de serĉmotoroj. Ĝenerale maksimume 20 vortoj sufiĉas."
+INSTL_SITE_OFFLINE_LABEL="Retejo senkonekta"
+INSTL_SITE_OFFLINE_TITLE_LABEL="Senkonektigi la Fronton kiam instalo pretas. La retejo poste povas esti retkonektita ene de la Tutloka agordo."
+INSTL_SITE_INSTALL_SAMPLE_LABEL="Instali specimenajn datumojn"
+INSTL_SITE_INSTALL_SAMPLE_DESC="Instalo de specimenaj datumoj estas forte rekomendata por novuloj. <br />Tio instalas ekzemplan enhavon inkluzivitan en la Joomla! instala pakaĵo."
+INSTL_SITE_INSTALL_SAMPLE_NONE="Neniu (<strong>Postulata por baza plurlingva reteja kreiĝo</strong>)"
+INSTL_SAMPLE_BLOG_SET="Anglalingva blogo (GB) ekzemplaj datumoj"
+INSTL_SAMPLE_BROCHURE_SET="Anglalingva broŝuro (GB) ekzemplaj datumoj"
+INSTL_SAMPLE_DATA_SET="Anglalingva defaŭlto (GB) ekzemplaj datumoj"
+INSTL_SAMPLE_LEARN_SET="Anglalingva Joomla lernado (GB) ekzemplaj datumoj"
+INSTL_SAMPLE_TESTING_SET="Anglalingva testo (GB) ekzemplaj datumoj"
+INSTL_SITE_INSTALL_SAMPLE_NONE_DESC="Instali Joomlan nur havante unu menuo kaj ensaluta modulo, sen iu ajn enhavo."
+INSTL_SAMPLE_BLOG_SET_DESC="Instali Joomlan kun kelkaj artikoloj kaj blogo kun rilataj moduloj kiel Malnovaj eroj, Bloglisto, Plej legataj eroj."
+INSTL_SAMPLE_BROCHURE_SET_DESC="Instali Joomlan kun kelkaj paĝoj (menuo kun paĝoj Hejme, Pri ni, Novaĵoj, Kontakti nin) kaj moduloj kiel Serci, Propra, Ensalutujo."
+INSTL_SAMPLE_DATA_SET_DESC="Instali Joomlan kun unu paĝo (menuo kun unu ligo) kaj moduloj kiel Lastaj artikoloj, Ensalutujo."
+INSTL_SAMPLE_LEARN_SET_DESC="Instali Joomlan kun ekzemplaj artikoloj kiuj priskribas kiel funkcias Joomla."
+INSTL_SAMPLE_TESTING_SET_DESC="Instali Joomlan kun ĉiu ebla menua objekto por helpi testi Joomlan."
+
+;Summary view
+INSTL_FINALISATION="Finiĝo"
+INSTL_SUMMARY_INSTALL="Instali"
+INSTL_SUMMARY_EMAIL_LABEL="Retpoŝtadresa agordo"
+INSTL_SUMMARY_EMAIL_DESC="Sendi agordojn al %s per retpoŝto post instalo."
+INSTL_SUMMARY_EMAIL_PASSWORDS_LABEL="Inkluzivi pasvortojn en retpoŝto"
+INSTL_SUMMARY_EMAIL_PASSWORDS_DESC="Averto! Estas rekomendite ne sendi kaj stoki viajn pasvortojn en retmesaĝoj."
+
+;Installing view
+INSTL_INSTALLING="Instalas..."
+INSTL_INSTALLING_DATABASE_BACKUP="Savkopias malnovajn datumbazajn tabelojn"
+INSTL_INSTALLING_DATABASE_REMOVE="Forigas malnovajn datumbazajn tabelojn"
+INSTL_INSTALLING_DATABASE="Kreas datumbazajn tabelojn"
+INSTL_INSTALLING_SAMPLE="Instalas specimenajn datumojn"
+INSTL_INSTALLING_CONFIG="Kreas agordan dosieron"
+INSTL_INSTALLING_EMAIL="Sendas retmesaĝon al %s"
+
+;Email
+INSTL_EMAIL_SUBJECT="Agordaj detaloj: %s"
+INSTL_EMAIL_HEADING="Sube vi trovas la agordojn por nove instalita Joomla! retejo:"
+INSTL_EMAIL_NOT_SENT="Ne povis sendi retmesaĝon."
+
+;Complete view
+INSTL_COMPLETE_ADMINISTRATION_LOGIN_DETAILS="Administraj ensalutiloj"
+; The word 'installation' should not be translated as it is a physical folder.
+INSTL_COMPLETE_ERROR_FOLDER_ALREADY_REMOVED="La instala dosierujo jam estis forigita."
+; The word 'installation' should not be translated as it is a physical folder.
+INSTL_COMPLETE_ERROR_FOLDER_DELETE="Instala dosierujo ne povas esti forigita. Bonvolu permane forigi ĝin."
+; The word 'installation' should not be translated as it is a physical folder.
+INSTL_COMPLETE_FOLDER_REMOVED="Instala dosierujo sukcese forigita."
+INSTL_COMPLETE_LANGUAGE_1="Joomla! en via propra lingvo kaj/aŭ aŭtomata baza plurlingva reteja kreiĝo"
+; The word 'installation' should not be translated as it is a physical folder.
+INSTL_COMPLETE_LANGUAGE_DESC="Antaŭ ol forigi la instalan dosierujon vi povas instali ekstrajn lingvojn. Se vi volas aldoni ekstrajn lingvojn al via Joomla aplikaĵo, elekti la sekvan butonon."
+INSTL_COMPLETE_LANGUAGE_DESC2="Notu: vi bezonas interretan aliron de Joomla! por elŝuti kaj instali novajn lingvojn. <br />Kelkaj servilaj agordoj ne permesas al Joomla! instali la lingvojn. Se tio estas la kazo por vi, ne zorgu, ĉar vi povos instali ilin pli malfrue per la Joomla! administrilo."
+; The word 'installation' should not be translated as it is a physical folder.
+INSTL_COMPLETE_REMOVE_FOLDER="Forigi instalan dosierujon"
+; The word 'installation' should not be translated as it is a physical folder.
+INSTL_COMPLETE_REMOVE_INSTALLATION="BONVOLU MEMORI TUTE FORIGI LA INSTALAN DOSIERUJON.<br />Vi ne povos preterpasi tiun ĉi paŝon se la instala dosierujo ne estis forigata. Tio estas sekureca trajto de Joomla!"
+INSTL_COMPLETE_TITLE="Gratulojn! Joomla estas nun instalita."
+INSTL_COMPLETE_INSTALL_LANGUAGES="Ekstraj paŝoj: Instali lingvojn"
+
+;Languages view
+INSTL_LANGUAGES="Intali lingvopakaĵojn"
+INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE="Lingvo"
+INSTL_LANGUAGES_COLUMN_HEADER_VERSION="Versio"
+INSTL_LANGUAGES_DESC="La Joomla interfaco haveblas en pluraj lingvoj. Elekti viajn preferatajn lingvojn per alklako al la elektobutonoj kaj poste instali ilin per elekto de la butono Sekva.<br />Notu: la elŝuto kaj instalo de ĉiu lingvo daŭras proksimume 10 sekundojn. Por eviti tempolimigojn bonvolu elekti ne pli ol 3 lingvoj por instali."
+INSTL_LANGUAGES_MESSAGE_PLEASE_WAIT="La plenumo de tiu ĉi operacio daŭras proksimume 10 sekundojn<br />Bonvolu atendi dum la elŝuto kaj instalo de la lingvoj..."
+INSTL_LANGUAGES_MORE_LANGUAGES="Alklai la butonon 'Antaŭa' se vi volas instali pliajn lingvojn."
+INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="Neniu lingvo elektita por instalo. Se vi bezonas pliajn lingvojn, alklaku la butonon 'Antaŭa' kaj elekti la deziratajn lingvojn el la listo."
+INSTL_LANGUAGES_WARNING_NO_INTERNET="Joomla! ne povis konekti al la lingva servilo. Bonvolu finigi la instaladan procedon."
+INSTL_LANGUAGES_WARNING_NO_INTERNET2="Notu: Vi povos instali lingvojn pli poste uzante la Joomla!n administrilon"
+INSTL_LANGUAGES_WARNING_BACK_BUTTON="Reiri al lasta instala paŝo"
+
+;Default language view
+INSTL_DEFAULTLANGUAGE_ACTIVATE_MULTILANGUAGE="Aktivigi la plurlingvan funkcion"
+INSTL_DEFAULTLANGUAGE_ACTIVATE_MULTILANGUAGE_DESC="Se aktiva, via Joomla retejo havos la plurlingvan funkcion aktiva kun tradukataj menuoj por ĉiu instalita lingvo."
+INSTL_DEFAULTLANGUAGE_ACTIVATE_LANGUAGE_CODE_PLUGIN="Ebligi la lingvokodan kromaĵon"
+INSTL_DEFAULTLANGUAGE_ACTIVATE_LANGUAGE_CODE_PLUGIN_DESC="Se ebligita, la lingvokoda kromaĵo aldonas eblecon ŝanĝi la lingvan kodon en la generita HTML-dokumento por plibonigi SEOn."
+INSTL_DEFAULTLANGUAGE_ADMINISTRATOR="Defaŭlta Administranta lingvo"
+INSTL_DEFAULTLANGUAGE_ADMIN_COULDNT_SET_DEFAULT="Joomla ne povis defaŭltigi la lingvon. La angla estos uzata kiel defaŭlta lingvo por la Dorsa administrejo."
+INSTL_DEFAULTLANGUAGE_ADMIN_SET_DEFAULT="Joomla elektis %s kiel via defaŭlta ADMINISTREJA lingvo."
+INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_SELECT="Elekti"
+INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_LANGUAGE="Lingvo"
+INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_TAG="Marko"
+INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_CONTENT_LANGUAGE="Joomla ne eblis aŭtomate krei la enhavan lingvon %s"
+INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_MENU="Joomla ne povis aŭtomate krei la menuon %s"
+INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_MENU_ITEM="Joomla ne povis aŭtomate krei la hejman menuobjekton %s"
+INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_MENU_MODULE="Joomla ne povis aŭtomate krei la menuan modulon %s"
+INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_CATEGORY="Joomla ne povis aŭtomate krei la enhavan kategorion %s"
+INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_ARTICLE="Joomla ne povis aŭtomate krei la tradukitan artikolon %s"
+INSTL_DEFAULTLANGUAGE_COULD_NOT_ENABLE_MODULESWHITCHER_LANGUAGECODE="Joomla ne povis aŭtomate publikigi la lingvoŝanĝan modulon"
+INSTL_DEFAULTLANGUAGE_COULD_NOT_ENABLE_PLG_LANGUAGECODE="Joomla ne povis aŭtomate ebligi la Lingvokodan kromaĵon"
+INSTL_DEFAULTLANGUAGE_COULD_NOT_ENABLE_PLG_LANGUAGEFILTER="Joomla ne povis aŭtomate ebligi la Lingvofiltran kromaĵon"
+INSTL_DEFAULTLANGUAGE_COULD_NOT_INSTALL_LANGUAGE="Joomla ne povis instali la lingvon %s."
+INSTL_DEFAULTLANGUAGE_COULD_NOT_PUBLISH_MOD_MULTILANGSTATUS="Joomla ne povis aŭtomate publikigi la modulon por lingva stato"
+INSTL_DEFAULTLANGUAGE_COULD_NOT_UNPUBLISH_MOD_DEFAULTMENU="Joomla ne povis aŭtomate malpublikigi la defaŭltan menuan modulon"
+INSTL_DEFAULTLANGUAGE_DESC="Joomla instalis la jenajn lingvojn. Bonvolu elekti vian deziratan defaŭltan lingvon por la Joomla Administrejo."
+INSTL_DEFAULTLANGUAGE_DESC_FRONTEND="Joomla instalis la jenajn lingvojn. Bonvolu elekti la deziratan defaŭltan lingvon por la Joomla Fronto."
+INSTL_DEFAULTLANGUAGE_FRONTEND="Defaŭlta reteja lingvo"
+INSTL_DEFAULTLANGUAGE_FRONTEND_COULDNT_SET_DEFAULT="Joomla ne povis elekti la lingvon kiel defaŭlto. La angla estos uzata kiel defaŭlta lingvo en la Fronta RETEJO."
+INSTL_DEFAULTLANGUAGE_FRONTEND_SET_DEFAULT="Joomla elektis %s kiel via defaŭlta RETEJA lingvo."
+INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT="Instali tradukitan enhavon"
+INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT_DESC="Se aktiva, Joomla aŭtomate kreos enhavan kategorion por ĉiu instalita lingvo. Aldone, unu emfazita artikolo enhavante sensencaĵon estos kreata por ĉiu kategorio."
+INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_TITLE="Plurlingva"
+INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_DESC="Tiu ĉi sekcio permesas vin aŭtomate aktivi la Joomla!n plurlingvan funkcion."
+INSTL_DEFAULTLANGUAGE_TRY_LATER="Vi povos instali ĝin poste uzante la Joomla!n Administrejon"
+
+; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example Spanish will be Español
+INSTL_DEFAULTLANGUAGE_NATIVE_LANGUAGE_NAME="la anglan (UK)"
+
+;Database Model
+INSTL_DATABASE_COULD_NOT_CONNECT="Ne povis konekti al la datumbazo. Konektilo redonis numeron: %s"
+INSTL_DATABASE_COULD_NOT_CREATE_DATABASE="La instalilo ne povis konekti al la specifita datumbazo kaj ne eblis krei la datumbazon. Bonvolu konfirmi viajn agordojn kaj se necese permane krei vian datumbazon."
+INSTL_DATABASE_COULD_NOT_REFRESH_MANIFEST_CACHE="Ne povis aktualigi manifestan kaŝmemoron por etendaĵo: %s"
+INSTL_DATABASE_ERROR_BACKINGUP="Kelkaj eraroj okazis dum savkopiado de la datumbazo."
+INSTL_DATABASE_ERROR_CREATE="Eraro okazis dum kreado de la datumbazo %s.<br />La uzanto eble ne havas sufiĉajn rajtojn por krei datumbazon. La postulata datumbazo eble devas esti aparte kreita antaŭ eblas instali Joomla!n."
+INSTL_DATABASE_ERROR_DELETE="Kelkaj eraroj okazis dum forigo de la datumbazo."
+INSTL_DATABASE_FIELD_VALUE_REMOVE="Forigi"
+INSTL_DATABASE_FIELD_VALUE_BACKUP="Savkopio"
+INSTL_DATABASE_FIX_TOO_LONG="Tabela prefikso de MySQL nur povas havi 15 signojn."
+INSTL_DATABASE_INVALID_DB_DETAILS="La provizitaj datumbazaj detaloj malkorektas kaj/aŭ mankas."
+INSTL_DATABASE_INVALID_MYSQL_VERSION="Vi bezonas MySQL 5.0.4 aŭ pli alte por daŭrigi la instalon. Via versio estas: %s"
+INSTL_DATABASE_INVALID_MYSQLI_VERSION="Vi bezonas MySQL 5.0.4 aŭ pli alte por daŭrigi la instalon. Via versio estas: %s"
+INSTL_DATABASE_INVALID_PDOMYSQL_VERSION="Vi bezonas MySQL 5.0.4 aŭ pli alte por daŭrigi la instalon. Via versio estas: %s"
+INSTL_DATABASE_INVALID_POSTGRESQL_VERSION="Vi bezonas PostgreSQL 8.3.18 aŭ pli alte por daŭrigi la instalon. Via versio estas: %s"
+INSTL_DATABASE_INVALID_SQLSRV_VERSION="Vi bezonas SQL-servilon 2008 R2 (10.50.1600.1) aŭ pli alte por daŭrigi la instalon. Via versio estas: %s"
+INSTL_DATABASE_INVALID_SQLZURE_VERSION="Vi bezonas SQL-servilon 2008 R2 (10.50.1600.1) aŭ pli alte por daŭrigi la instalon. Via versio estas: %s"
+INSTL_DATABASE_INVALID_TYPE="Bonvolu elekti la datumbazan tipon"
+INSTL_DATABASE_NAME_TOO_LONG="La datumbaza nomo de MySQL nur povas havi 64 signojn."
+INSTL_DATABASE_INVALID_NAME="Versioj de MySQL antaŭ 5.1.6 eble ne povas enhavi punktiojn aŭ aliajn "_QQ_"specialajn"_QQ_" signojn en la nomo. Via versio estas: %s"
+INSTL_DATABASE_NAME_INVALID_SPACES="Datumbazaj nomoj kaj tabelaj nomoj de MySQL ne povas komenci per spaceto."
+INSTL_DATABASE_NAME_INVALID_CHAR="Neniu MySQL-identigilo povas enhavi NULL ASCII(0x00)."
+INSTL_DATABASE_FILE_DOES_NOT_EXIST="Dosiero %s ne ekzistas"
+
+;controllers
+INSTL_COOKIES_NOT_ENABLED="Kukoj supozeble ne estas ebligitaj en via retesplorilo. Vi ne povos instali la aplikaĵon dum la funkcio estas malebligita. Alternative, povus ankaŭ esti problemo kun la <strong>session.save_path</strong> de la servilo. Se jes, bonvolu diskuti kun via reteja gastiganto se vi ne mem scias kiel funkciigi tion ĉi."
+INSTL_HEADER_ERROR="Eraro"
+
+;Helpers
+INSTL_PAGE_TITLE="Joomla! Reteja instalilo"
+
+;Configuration model
+INSTL_ERROR_CONNECT_DB="Ne povis konekti al lla datumbazo. Konektilo redonis numeron: %s"
+INSTL_STD_OFFLINE_MSG="Tiu ĉi retejo estas malaktiva pro administrado kaj mastrumado.<br /> Bonvolu viziti nin baldaŭ denove."
+
+;FTP model
+INSTL_FTP_INVALIDROOT="La specificita FTP-dosierujo ne estas la dosierujo de tiu ĉi Joomla! instalo"
+INSTL_FTP_NOCONNECT="Ne povis konekti al la FTP-servilo"
+INSTL_FTP_NODELE="La funkcio "_QQ_"DELE"_QQ_" fiaskis."
+INSTL_FTP_NODIRECTORYLISTING="Ne povis retrovi dosierujan listigon de la FTP servilo."
+INSTL_FTP_NOLIST="La funkcio "_QQ_"LIST"_QQ_" fiaskis."
+INSTL_FTP_NOLOGIN="Ne povis ensaluti al la FTPa servilo."
+INSTL_FTP_NOMKD="La funkcio "_QQ_"MKD"_QQ_" fiaskis."
+INSTL_FTP_NONLST="La funkcio "_QQ_"NLST"_QQ_" fiaskis."
+INSTL_FTP_NOPWD="La funkcio "_QQ_"PWD"_QQ_" fiaskis."
+INSTL_FTP_NORETR="La funkcio "_QQ_"RETR"_QQ_" fiaskis."
+INSTL_FTP_NORMD="La funkcio "_QQ_"RMD"_QQ_" fiaskis."
+INSTL_FTP_NOROOT="Ne povis aliri la specifitan FTP-dosierujon."
+INSTL_FTP_NOSTOR="La funkcio "_QQ_"STOR"_QQ_" fiaskis."
+INSTL_FTP_NOSYST="La funkcio "_QQ_"SYST"_QQ_" fiaskis."
+INSTL_FTP_UNABLE_DETECT_ROOT_FOLDER="Neeble aŭto-detekti la FTPan radikan dosierujon."
+
+;others
+INSTL_CONFPROBLEM="Via agorda dosiero aŭ dosierujo ne estas skribebla aŭ okazis problemon kreante la agordan dosieron. Vi devas alŝuti la jenan kodon permane. Elekti en la tekstareo por marki ĉiun kodon kaj poste glui ĝin en novan tekstdosieron. Nomigu la dosieron 'configuration.php' kaj alŝutu ĝin al la radika dosierujo de via retejo."
+INSTL_DATABASE_EMPTY_NAME=""
+INSTL_DATABASE_SUPPORT="Datumbaza subteno:"
+INSTL_DISPLAY_ERRORS="Montri erarojn"
+INSTL_ERROR_DB="Kelkaj eraroj okazis dum plenigo de la datumbazo: %s"
+INSTL_ERROR_INITIALISE_SCHEMA="Ne povas iniciati datumbazan skemon"
+INSTL_FILE_UPLOADS="Alŝutoj de dosieroj"
+INSTL_GNU_GPL_LICENSE="GNU Ĝenerala Publika Permesilo"
+INSTL_JSON_SUPPORT_AVAILABLE="JSON subteno"
+INSTL_MAGIC_QUOTES_GPC="Magiaj citiloj GPC Dee"
+INSTL_MAGIC_QUOTES_RUNTIME="Vivdaŭro de Magiaj Citiloj"
+INSTL_MB_LANGUAGE_IS_DEFAULT="MB Lingvo estas defaŭlto"
+INSTL_MB_STRING_OVERLOAD_OFF="MB String Overload Dee"
+INSTL_NOTICEMBLANGNOTDEFAULT="Lingvo de PHP mbstring ne estas neŭtrala. Tio povas esti ŝanĝita loke per enigo de <strong>php_value mbstring.language neutral</strong> en via dosiero<code>.htaccess</code>."
+INSTL_NOTICEMBSTRINGOVERLOAD="PHP mbstring funkcia superŝarĝo estas ŝaltita. Tio povas esti malŝaltita per enigo de <strong>php_value mbstring.func_overload 0</strong> en via dosiero <code>.htaccess</code>."
+INSTL_NOTICEYOUCANSTILLINSTALL="<br />Vi ankoraŭ povas daŭrigi la instalon ĉar la agordoj estos montrataj en la fino. Vi devas alŝuti la kodon permane. Elekti en la tekstareo por marki ĉiun kodon por glui ĝin en novan tekstdosieron. Nomigu la dosieron 'configuation.php' kaj alŝutu ĝin al la radika dosierujo de via retejo."
+INSTL_OUTPUT_BUFFERING="Eliga bufrado"
+INSTL_PARSE_INI_FILE_AVAILABLE="INI sintaksa analizila subteno"
+INSTL_PHP_VERSION="PHP-versio"
+INSTL_PHP_VERSION_NEWER="PHP-versio >= %s"
+INSTL_REGISTER_GLOBALS="Register Globals dee"
+INSTL_SAFE_MODE="Sekura reĝimo (Safe mode)"
+INSTL_SESSION_AUTO_START="Aŭtolanĉo de seanco"
+INSTL_WRITABLE="%s skribebla"
+INSTL_XML_SUPPORT="XML subteno"
+INSTL_ZIP_SUPPORT_AVAILABLE="Indiĝena subteno por ZIP"
+INSTL_ZLIB_COMPRESSION_SUPPORT="Zlib kompaktiga subteno"
+INSTL_PROCESS_BUSY="Procezo progresas. Bonvolu atendi..."
+
+
+;Global strings
+JADMINISTRATOR="Administrejo"
+JCHECK_AGAIN="Kontroli denove"
+JERROR="Eraro"
+JEMAIL="Retpoŝto"
+JGLOBAL_ISFREESOFTWARE="%s estas libera kodo eldonata sub la %s."
+JGLOBAL_LANGUAGE_VERSION_NOT_PLATFORM="Lingva pakaĵo ne kongruas kun tiu ĉi versio de Joomla!. Kelkaj ĉenoj eble mankas."
+JGLOBAL_SELECT_AN_OPTION="Elekti opcion"
+JGLOBAL_SELECT_NO_RESULTS_MATCH="Neniu kongrua rezulto"
+JGLOBAL_SELECT_SOME_OPTIONS="Elekti kelkajn opciojn"
+JINVALID_TOKEN="La plej lasta peto estis malakceptita ĉar ĝi enhavis nevalidan sekuran ĵetonon. Bv. aktualigi la paĝon kaj provi denove."
+JNEXT="Sekva"
+JNO="Ne"
+JNOTICE="Rimarko"
+JOFF="Dee"
+JON="Ale"
+JPREVIOUS="Antaŭa"
+JSITE="Fronto"
+JUSERNAME="Salutnomo"
+JYES="Jes"
+
+; Framework strings necessary when no lang pack is available
+JLIB_DATABASE_ERROR_CONNECT_MYSQL="Ne povis konekti al MySQL."
+JLIB_DATABASE_ERROR_DATABASE="Datumbaza eraro okazis."
+JLIB_DATABASE_ERROR_LOAD_DATABASE_DRIVER="Ne-ebla ŝargi Datumbazan pelilon: %s"
+JLIB_ENVIRONMENT_SESSION_EXPIRED="Via seanco eksvalidiĝis, bonvolu reŝargi la paĝon."
+JLIB_FILESYSTEM_ERROR_COPY_FAILED="Kopiado fiaskis"
+JLIB_FILESYSTEM_ERROR_PATH_IS_NOT_A_FOLDER_FILES="JFolder: :files: Vojo ne estas dosierujo. Vojo: %s"
+JLIB_FORM_FIELD_INVALID="Nevalida kampo:&#160;"
+JLIB_FORM_VALIDATE_FIELD_INVALID="Nevalida kampo: %s"
+JLIB_FORM_VALIDATE_FIELD_REQUIRED="Postulata kampo: %s"
+JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :Install: Fiaskis kopii dosieron %1$s al %2$s."
+JLIB_INSTALLER_NOT_ERROR="Se la eraro rilatas al la instalo de lingvaj dosieroj de TinyMCE tio ne influas la instaladon de la lingvo(j). Kelkaj lingvopakaĵoj kreitaj antaŭ Joomla! 3.2.0 povas provi instali apartajn lingvodosierojn por TinyMCE. Ĉar tiuj nun estas parto de la kerno ili ne plu devas esti instalitaj."
+JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: Ne povis konekti kun datumbazo <br />joomla.library: %1$s - %2$s"
+
+; Strings for the language debugger
+JDEBUG_LANGUAGE_UNTRANSLATED_STRING="Netradukitaj ĉenoj"
+JDEBUG_LANGUAGE_FILES_IN_ERROR="Sintaksaj eraroj en lingvaj dosieroj"
+JNONE="Neniu"
+
+; Necessary for errors
+ADMIN_EMAIL="Retpoŝto de administranto"
+ADMIN_PASSWORD="Administranta pasvorto"
+ADMIN_PASSWORD2="Konfirmi pasvorton de administranto"
+SITE_NAME="Reteja nomo"
+
+; Database types (allows for a more descriptive label than the internal name)
+MYSQL="MySQL"
+MYSQLI="MySQLi"
+ORACLE="Oracle"
+PDOMYSQL="MySQL (PDO)"
+POSTGRESQL="PostgreSQL"
+SQLAZURE="Microsoft SQL Azure"
+SQLITE="SQLite"
+SQLSRV="Microsoft SQL Servilo"
diff --git a/installation/language/eo-XX/eo-XX.xml b/installation/language/eo-XX/eo-XX.xml
new file mode 100644
index 0000000000000..1e568ebbf8a0f
--- /dev/null
+++ b/installation/language/eo-XX/eo-XX.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metafile
+	version="3.5"
+	client="installation">
+	<name>Esperanto</name>
+	<version>3.5.0</version>
+	<creationDate>Aŭgusto 2015</creationDate>
+	<author>EsperantoSverige, Svedio</author>
+	<authorEmail>tradukoj@esperantosverige.se</authorEmail>
+	<authorUrl>esperantosverige.se</authorUrl>
+	<copyright>Kopirajto (C) 2005 - 2015 Open Source Matters. Ĉiuj rajtoj rezervitaj.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<description></description>
+	<files>
+		<filename>eo-XX.ini</filename>
+	</files>
+	<metadata>
+		<name>Esperanto</name>
+		<tag>eo-XX</tag>
+		<rtl>0</rtl>
+	</metadata>
+	<params />
+</metafile>

From 3f984e5cc26432890dc0c97e47e924a6488d689b Mon Sep 17 00:00:00 2001
From: vinespie <vincent.espie@gmail.com>
Date: Mon, 30 Mar 2015 16:01:28 +0200
Subject: [PATCH 136/176] [bug] Client-side form validation : remove
 aria-invalid on label. Fixes #6613

---
 media/system/js/validate-uncompressed.js | 4 ++--
 media/system/js/validate.js              | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/media/system/js/validate-uncompressed.js b/media/system/js/validate-uncompressed.js
index 6c446c89a1a61..6d42d19f1a53f 100644
--- a/media/system/js/validate-uncompressed.js
+++ b/media/system/js/validate-uncompressed.js
@@ -50,12 +50,12 @@ var JFormValidator = function() {
  	 	if (state === false) {
  	 	 	$el.addClass('invalid').attr('aria-invalid', 'true');
  	 	 	if ($label) {
- 	 	 	 	$label.addClass('invalid').attr('aria-invalid', 'true');
+ 	 	 	 	$label.addClass('invalid');
  	 	 	}
  	 	} else {
  	 	 	$el.removeClass('invalid').attr('aria-invalid', 'false');
  	 	 	if ($label) {
- 	 	 	 	$label.removeClass('invalid').attr('aria-invalid', 'false');
+ 	 	 	 	$label.removeClass('invalid');
  	 	 	}
  	 	}
  	},
diff --git a/media/system/js/validate.js b/media/system/js/validate.js
index 5029f3eab94b3..e3058803f72f1 100644
--- a/media/system/js/validate.js
+++ b/media/system/js/validate.js
@@ -1 +1 @@
-var JFormValidator=function(){"use strict";var t,e,a,r=function(e,a,r){r=""===r?!0:r,t[e]={enabled:r,exec:a}},n=function(t,e){var a,r=jQuery(e);return t?(a=r.find("#"+t+"-lbl"),a.length?a:(a=r.find('label[for="'+t+'"]'),a.length?a:!1)):!1},i=function(t,e){var a=e.data("label");void 0===a&&(a=n(e.attr("id"),e.get(0).form),e.data("label",a)),t===!1?(e.addClass("invalid").attr("aria-invalid","true"),a&&a.addClass("invalid").attr("aria-invalid","true")):(e.removeClass("invalid").attr("aria-invalid","false"),a&&a.removeClass("invalid").attr("aria-invalid","false"))},l=function(e){var a,r,n=jQuery(e);if(n.attr("disabled"))return i(!0,n),!0;if(n.attr("required")||n.hasClass("required"))if(a=n.prop("tagName").toLowerCase(),"fieldset"===a&&(n.hasClass("radio")||n.hasClass("checkboxes"))){if(!n.find("input:checked").length)return i(!1,n),!1}else if(!n.val()||n.hasClass("placeholder")||"checkbox"===n.attr("type")&&!n.is(":checked"))return i(!1,n),!1;return r=n.attr("class")&&n.attr("class").match(/validate-([a-zA-Z0-9\_\-]+)/)?n.attr("class").match(/validate-([a-zA-Z0-9\_\-]+)/)[1]:"",""===r?(i(!0,n),!0):r&&"none"!==r&&t[r]&&n.val()&&t[r].exec(n.val(),n)!==!0?(i(!1,n),!1):(i(!0,n),!0)},u=function(t){var e,r,n,i,u,s,o=!0,d=[];for(e=jQuery(t).find("input, textarea, select, fieldset"),u=0,s=e.length;s>u;u++)l(e[u])===!1&&(o=!1,d.push(e[u]));if(jQuery.each(a,function(t,e){e.exec()!==!0&&(o=!1)}),!o&&d.length>0){for(r=Joomla.JText._("JLIB_FORM_FIELD_INVALID"),n={error:[]},u=d.length-1;u>=0;u--)i=jQuery(d[u]).data("label"),i&&n.error.push(r+i.text().replace("*",""));Joomla.renderMessages(n)}return o},s=function(t){var a,r=[],n=jQuery(t);a=n.find("input, textarea, select, fieldset, button");for(var i=0,s=a.length;s>i;i++){var o=jQuery(a[i]),d=o.prop("tagName").toLowerCase();"input"!==d&&"button"!==d||"submit"!==o.attr("type")&&"image"!==o.attr("type")?"button"===d||"input"===d&&"button"===o.attr("type")||(o.hasClass("required")&&o.attr("aria-required","true").attr("required","required"),"fieldset"!==d&&(o.on("blur",function(){return l(this)}),o.hasClass("validate-email")&&e&&(o.get(0).type="email")),r.push(o)):o.hasClass("validate")&&o.on("click",function(){return u(t)})}n.data("inputfields",r)},o=function(){t={},a=a||{},e=function(){var t=document.createElement("input");return t.setAttribute("type","email"),"text"!==t.type}(),r("username",function(t){var e=new RegExp("[<|>|\"|'|%|;|(|)|&]","i");return!e.test(t)}),r("password",function(t){var e=/^\S[\S ]{2,98}\S$/;return e.test(t)}),r("numeric",function(t){var e=/^(\d|-)?(\d|,)*\.?\d*$/;return e.test(t)}),r("email",function(t){t=punycode.toASCII(t);var e=/^[a-zA-Z0-9.!#$%&’*+\/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*$/;return e.test(t)});for(var n=jQuery("form.form-validate"),i=0,l=n.length;l>i;i++)s(n[i])};return o(),{isValid:u,validate:l,setHandler:r,attachToForm:s,custom:a}};document.formvalidator=null,jQuery(function(){document.formvalidator=new JFormValidator});
+var JFormValidator=function(){"use strict";var t,e,a,r=function(e,a,r){r=""===r?!0:r,t[e]={enabled:r,exec:a}},n=function(t,e){var a,r=jQuery(e);return t?(a=r.find("#"+t+"-lbl"),a.length?a:(a=r.find('label[for="'+t+'"]'),a.length?a:!1)):!1},i=function(t,e){var a=e.data("label");void 0===a&&(a=n(e.attr("id"),e.get(0).form),e.data("label",a)),t===!1?(e.addClass("invalid").attr("aria-invalid","true"),a&&a.addClass("invalid")):(e.removeClass("invalid").attr("aria-invalid","false"),a&&a.removeClass("invalid"))},l=function(e){var a,r,n=jQuery(e);if(n.attr("disabled"))return i(!0,n),!0;if(n.attr("required")||n.hasClass("required"))if(a=n.prop("tagName").toLowerCase(),"fieldset"===a&&(n.hasClass("radio")||n.hasClass("checkboxes"))){if(!n.find("input:checked").length)return i(!1,n),!1}else if(!n.val()||n.hasClass("placeholder")||"checkbox"===n.attr("type")&&!n.is(":checked"))return i(!1,n),!1;return r=n.attr("class")&&n.attr("class").match(/validate-([a-zA-Z0-9\_\-]+)/)?n.attr("class").match(/validate-([a-zA-Z0-9\_\-]+)/)[1]:"",""===r?(i(!0,n),!0):r&&"none"!==r&&t[r]&&n.val()&&t[r].exec(n.val(),n)!==!0?(i(!1,n),!1):(i(!0,n),!0)},u=function(t){var e,r,n,i,u,s,o=!0,d=[];for(e=jQuery(t).find("input, textarea, select, fieldset"),u=0,s=e.length;s>u;u++)l(e[u])===!1&&(o=!1,d.push(e[u]));if(jQuery.each(a,function(t,e){e.exec()!==!0&&(o=!1)}),!o&&d.length>0){for(r=Joomla.JText._("JLIB_FORM_FIELD_INVALID"),n={error:[]},u=d.length-1;u>=0;u--)i=jQuery(d[u]).data("label"),i&&n.error.push(r+i.text().replace("*",""));Joomla.renderMessages(n)}return o},s=function(t){var a,r=[],n=jQuery(t);a=n.find("input, textarea, select, fieldset, button");for(var i=0,s=a.length;s>i;i++){var o=jQuery(a[i]),d=o.prop("tagName").toLowerCase();"input"!==d&&"button"!==d||"submit"!==o.attr("type")&&"image"!==o.attr("type")?"button"===d||"input"===d&&"button"===o.attr("type")||(o.hasClass("required")&&o.attr("aria-required","true").attr("required","required"),"fieldset"!==d&&(o.on("blur",function(){return l(this)}),o.hasClass("validate-email")&&e&&(o.get(0).type="email")),r.push(o)):o.hasClass("validate")&&o.on("click",function(){return u(t)})}n.data("inputfields",r)},o=function(){t={},a=a||{},e=function(){var t=document.createElement("input");return t.setAttribute("type","email"),"text"!==t.type}(),r("username",function(t,e){var a=new RegExp("[<|>|\"|'|%|;|(|)|&]","i");return!a.test(t)}),r("password",function(t,e){var a=/^\S[\S ]{2,98}\S$/;return a.test(t)}),r("numeric",function(t,e){var a=/^(\d|-)?(\d|,)*\.?\d*$/;return a.test(t)}),r("email",function(t,e){t=punycode.toASCII(t);var a=/^[a-zA-Z0-9.!#$%&’*+\/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*$/;return a.test(t)});for(var n=jQuery("form.form-validate"),i=0,l=n.length;l>i;i++)s(n[i])};return o(),{isValid:u,validate:l,setHandler:r,attachToForm:s,custom:a}};document.formvalidator=null,jQuery(function(){document.formvalidator=new JFormValidator});

From fc124a20f2b80f6aa749166f4b047a1e6e79a37b Mon Sep 17 00:00:00 2001
From: Jean-Marie Simonet <infografjms@gmail.com>
Date: Thu, 26 Nov 2015 08:14:11 +0100
Subject: [PATCH 137/176] Correcting some language strings values

---
 administrator/language/en-GB/en-GB.lib_joomla.ini | 8 ++++----
 language/en-GB/en-GB.lib_joomla.ini               | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/administrator/language/en-GB/en-GB.lib_joomla.ini b/administrator/language/en-GB/en-GB.lib_joomla.ini
index 3fa7ce40818e0..15edc4195cd62 100644
--- a/administrator/language/en-GB/en-GB.lib_joomla.ini
+++ b/administrator/language/en-GB/en-GB.lib_joomla.ini
@@ -625,7 +625,7 @@ JLIB_MEDIA_ERROR_WARNINVALID_IMG="Not a valid image."
 JLIB_MEDIA_ERROR_WARNINVALID_MIME="Illegal or invalid mime type detected."
 JLIB_MEDIA_ERROR_WARNNOTADMIN="Uploaded file is not an image file and you do not have permission."
 
-JLIB_NO_EDITOR_PLUGIN_PUBLISHED="We can't show an editor because no editor plugin is published."
+JLIB_NO_EDITOR_PLUGIN_PUBLISHED="Unable to display an editor because no editor plugin is published."
 
 JLIB_PLUGIN_ERROR_LOADING_PLUGINS="Error loading Plugins: %s"
 JLIB_REGISTRY_EXCEPTION_LOAD_FORMAT_CLASS="Unable to load format class."
@@ -635,7 +635,7 @@ JLIB_RULES_ALLOWED="Allowed"
 JLIB_RULES_ALLOWED_ADMIN="Allowed (Super User)"
 JLIB_RULES_CALCULATED_SETTING="Calculated Setting <sup>2</sup>"
 JLIB_RULES_CONFLICT="Conflict"
-JLIB_RULES_DATABASE_FAILURE="Failure by storing the data to the database."
+JLIB_RULES_DATABASE_FAILURE="Failed storing the data to the database."
 JLIB_RULES_DENIED="Denied"
 JLIB_RULES_GROUP="%s"
 JLIB_RULES_GROUPS="Groups"
@@ -645,8 +645,8 @@ JLIB_RULES_NOT_ALLOWED="Not Allowed."
 JLIB_RULES_NOT_ALLOWED_ADMIN_CONFLICT="Conflict"
 JLIB_RULES_NOT_ALLOWED_LOCKED="Not Allowed (Locked)"
 JLIB_RULES_NOT_SET="Not Set"
-JLIB_RULES_REQUEST_FAILURE="Failure by sending the data to server."
-JLIB_RULES_SAVE_BEFORE_CHANGE_PERMISSIONS="Please save before change permissions."
+JLIB_RULES_REQUEST_FAILURE="Failed sending the data to server."
+JLIB_RULES_SAVE_BEFORE_CHANGE_PERMISSIONS="Please save before changing permissions."
 JLIB_RULES_SELECT_ALLOW_DENY_GROUP="Allow or deny %s for users in the %s group."
 JLIB_RULES_SELECT_SETTING="Select New Setting <sup>1</sup>"
 JLIB_RULES_SETTING_NOTES="1. If you change the setting, it will apply to this and all child groups, components and content. Note that <em>Denied</em> will overrule any inherited setting and also the setting in any child group, component or content. In the case of a setting conflict, <em>Deny</em> will take precedence. <em>Not Set</em> is equivalent to <em>Denied</em> but can be changed in child groups, components and content.<br />2. If you select a new setting, select <em>Save</em> to refresh the calculated settings."
diff --git a/language/en-GB/en-GB.lib_joomla.ini b/language/en-GB/en-GB.lib_joomla.ini
index 3fa7ce40818e0..15edc4195cd62 100644
--- a/language/en-GB/en-GB.lib_joomla.ini
+++ b/language/en-GB/en-GB.lib_joomla.ini
@@ -625,7 +625,7 @@ JLIB_MEDIA_ERROR_WARNINVALID_IMG="Not a valid image."
 JLIB_MEDIA_ERROR_WARNINVALID_MIME="Illegal or invalid mime type detected."
 JLIB_MEDIA_ERROR_WARNNOTADMIN="Uploaded file is not an image file and you do not have permission."
 
-JLIB_NO_EDITOR_PLUGIN_PUBLISHED="We can't show an editor because no editor plugin is published."
+JLIB_NO_EDITOR_PLUGIN_PUBLISHED="Unable to display an editor because no editor plugin is published."
 
 JLIB_PLUGIN_ERROR_LOADING_PLUGINS="Error loading Plugins: %s"
 JLIB_REGISTRY_EXCEPTION_LOAD_FORMAT_CLASS="Unable to load format class."
@@ -635,7 +635,7 @@ JLIB_RULES_ALLOWED="Allowed"
 JLIB_RULES_ALLOWED_ADMIN="Allowed (Super User)"
 JLIB_RULES_CALCULATED_SETTING="Calculated Setting <sup>2</sup>"
 JLIB_RULES_CONFLICT="Conflict"
-JLIB_RULES_DATABASE_FAILURE="Failure by storing the data to the database."
+JLIB_RULES_DATABASE_FAILURE="Failed storing the data to the database."
 JLIB_RULES_DENIED="Denied"
 JLIB_RULES_GROUP="%s"
 JLIB_RULES_GROUPS="Groups"
@@ -645,8 +645,8 @@ JLIB_RULES_NOT_ALLOWED="Not Allowed."
 JLIB_RULES_NOT_ALLOWED_ADMIN_CONFLICT="Conflict"
 JLIB_RULES_NOT_ALLOWED_LOCKED="Not Allowed (Locked)"
 JLIB_RULES_NOT_SET="Not Set"
-JLIB_RULES_REQUEST_FAILURE="Failure by sending the data to server."
-JLIB_RULES_SAVE_BEFORE_CHANGE_PERMISSIONS="Please save before change permissions."
+JLIB_RULES_REQUEST_FAILURE="Failed sending the data to server."
+JLIB_RULES_SAVE_BEFORE_CHANGE_PERMISSIONS="Please save before changing permissions."
 JLIB_RULES_SELECT_ALLOW_DENY_GROUP="Allow or deny %s for users in the %s group."
 JLIB_RULES_SELECT_SETTING="Select New Setting <sup>1</sup>"
 JLIB_RULES_SETTING_NOTES="1. If you change the setting, it will apply to this and all child groups, components and content. Note that <em>Denied</em> will overrule any inherited setting and also the setting in any child group, component or content. In the case of a setting conflict, <em>Deny</em> will take precedence. <em>Not Set</em> is equivalent to <em>Denied</em> but can be changed in child groups, components and content.<br />2. If you select a new setting, select <em>Save</em> to refresh the calculated settings."

From 3f9f446c376440be640d6541651b07c83e3957a4 Mon Sep 17 00:00:00 2001
From: zero-24 <zero-24@users.noreply.github.com>
Date: Fri, 27 Nov 2015 11:43:35 +0100
Subject: [PATCH 138/176] https://joomla.stackexchange.com

---
 administrator/modules/mod_menu/tmpl/default_enabled.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/administrator/modules/mod_menu/tmpl/default_enabled.php b/administrator/modules/mod_menu/tmpl/default_enabled.php
index e7267c19a16b6..424f0f8abed6a 100644
--- a/administrator/modules/mod_menu/tmpl/default_enabled.php
+++ b/administrator/modules/mod_menu/tmpl/default_enabled.php
@@ -368,7 +368,7 @@
 		new JMenuNode(JText::_('MOD_MENU_HELP_SECURITY'), 'https://developer.joomla.org/security-centre.html', 'class:help-security', false, '_blank')
 	);
 	$menu->addChild(new JMenuNode(JText::_('MOD_MENU_HELP_DEVELOPER'), 'https://developer.joomla.org', 'class:help-dev', false, '_blank'));
-	$menu->addChild(new JMenuNode(JText::_('MOD_MENU_HELP_XCHANGE'), 'http://joomla.stackexchange.com', 'class:help-dev', false, '_blank'));
+	$menu->addChild(new JMenuNode(JText::_('MOD_MENU_HELP_XCHANGE'), 'https://joomla.stackexchange.com', 'class:help-dev', false, '_blank'));
 	$menu->addChild(new JMenuNode(JText::_('MOD_MENU_HELP_SHOP'), 'http://shop.joomla.org', 'class:help-shop', false, '_blank'));
 	$menu->getParent();
 }

From bf0d420a6b17ef0ad8b35bc242056db76a4ea77d Mon Sep 17 00:00:00 2001
From: zero-24 <zero-24@users.noreply.github.com>
Date: Fri, 27 Nov 2015 11:52:29 +0100
Subject: [PATCH 139/176] Update default_enabled.php

---
 .../templates/hathor/html/mod_menu/default_enabled.php          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/administrator/templates/hathor/html/mod_menu/default_enabled.php b/administrator/templates/hathor/html/mod_menu/default_enabled.php
index f893753821707..047f17dacc259 100644
--- a/administrator/templates/hathor/html/mod_menu/default_enabled.php
+++ b/administrator/templates/hathor/html/mod_menu/default_enabled.php
@@ -343,7 +343,7 @@
 		new JMenuNode(JText::_('MOD_MENU_HELP_DEVELOPER'), 'https://developer.joomla.org', 'class:help-dev', false, '_blank')
 	);
 	$menu->addChild(
-		new JMenuNode(JText::_('MOD_MENU_HELP_XCHANGE'), 'http://joomla.stackexchange.com', 'class:help-dev', false, '_blank')
+		new JMenuNode(JText::_('MOD_MENU_HELP_XCHANGE'), 'https://joomla.stackexchange.com', 'class:help-dev', false, '_blank')
 	);
 	$menu->addChild(
 		new JMenuNode(JText::_('MOD_MENU_HELP_SHOP'), 'http://shop.joomla.org', 'class:help-shop', false, '_blank')

From c3b1cd453e18b3195d9224c7c7cc12d4936d5b84 Mon Sep 17 00:00:00 2001
From: Brian Teeman <brian@teeman.net>
Date: Fri, 27 Nov 2015 11:27:53 +0000
Subject: [PATCH 140/176] remove hyphen

---
 .../language/en-GB/en-GB.plg_quickicon_extensionupdate.ini      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/administrator/language/en-GB/en-GB.plg_quickicon_extensionupdate.ini b/administrator/language/en-GB/en-GB.plg_quickicon_extensionupdate.ini
index 1c342a792b8f2..eab09a1583763 100644
--- a/administrator/language/en-GB/en-GB.plg_quickicon_extensionupdate.ini
+++ b/administrator/language/en-GB/en-GB.plg_quickicon_extensionupdate.ini
@@ -11,5 +11,5 @@ PLG_QUICKICON_EXTENSIONUPDATE_GROUP_LABEL="Group"
 PLG_QUICKICON_EXTENSIONUPDATE_UPDATEFOUND="Updates are available! <span class='label label-important'>%s</span>"
 PLG_QUICKICON_EXTENSIONUPDATE_UPDATEFOUND_BUTTON="View Updates"
 PLG_QUICKICON_EXTENSIONUPDATE_UPDATEFOUND_MESSAGE="<span class='label label-important'>%s</span> Extension Update(s) are available:"
-PLG_QUICKICON_EXTENSIONUPDATE_UPTODATE="All extensions are up-to-date."
+PLG_QUICKICON_EXTENSIONUPDATE_UPTODATE="All extensions are up to date."
 PLG_QUICKICON_EXTENSIONUPDATE_XML_DESCRIPTION="Checks for updates of your installed third-party extensions and notifies you when you visit the Control Panel page."

From e37f2469bd5f3d04bfb7583af7a9115535794e7f Mon Sep 17 00:00:00 2001
From: Brian Teeman <brian@teeman.net>
Date: Fri, 27 Nov 2015 11:29:14 +0000
Subject: [PATCH 141/176] remove hyphen and bang

---
 .../language/en-GB/en-GB.plg_quickicon_joomlaupdate.ini         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/administrator/language/en-GB/en-GB.plg_quickicon_joomlaupdate.ini b/administrator/language/en-GB/en-GB.plg_quickicon_joomlaupdate.ini
index d78aac6d5e2ba..6e64c85d8614d 100644
--- a/administrator/language/en-GB/en-GB.plg_quickicon_joomlaupdate.ini
+++ b/administrator/language/en-GB/en-GB.plg_quickicon_joomlaupdate.ini
@@ -11,5 +11,5 @@ PLG_QUICKICON_JOOMLAUPDATE_GROUP_LABEL="Group"
 PLG_QUICKICON_JOOMLAUPDATE_UPDATEFOUND="Joomla! <span class='label label-important'>%s</span>, Update now!"
 PLG_QUICKICON_JOOMLAUPDATE_UPDATEFOUND_BUTTON="Update Now"
 PLG_QUICKICON_JOOMLAUPDATE_UPDATEFOUND_MESSAGE="Joomla! <span class='label label-important'>%s</span> is available:"
-PLG_QUICKICON_JOOMLAUPDATE_UPTODATE="Joomla! is up-to-date."
+PLG_QUICKICON_JOOMLAUPDATE_UPTODATE="Joomla is up to date."
 PLG_QUICKICON_JOOMLAUPDATE_XML_DESCRIPTION="Checks for Joomla! updates and notifies you when you visit the Control Panel page."

From e557e0e2c9ae620db01ca23e1666301755a17fec Mon Sep 17 00:00:00 2001
From: Thomas Hunziker <werbemails@bakual.ch>
Date: Fri, 27 Nov 2015 19:12:45 +0100
Subject: [PATCH 142/176] Updating installation language files

---
 installation/language/nb-NO/nb-NO.ini | 15 +++++++------
 installation/language/nb-NO/nb-NO.xml |  4 ++--
 installation/language/nn-NO/nn-NO.ini | 10 +++++++--
 installation/language/nn-NO/nn-NO.xml |  4 ++--
 installation/language/zh-CN/zh-CN.ini | 32 ++++++++++++++++-----------
 installation/language/zh-CN/zh-CN.xml |  4 ++--
 6 files changed, 41 insertions(+), 28 deletions(-)

diff --git a/installation/language/nb-NO/nb-NO.ini b/installation/language/nb-NO/nb-NO.ini
index 5944a4e9de87a..81608a45358ac 100644
--- a/installation/language/nb-NO/nb-NO.ini
+++ b/installation/language/nb-NO/nb-NO.ini
@@ -87,7 +87,7 @@ INSTL_SAMPLE_LEARN_SET="Engelsk eksempeldata - Lær Joomla!"
 INSTL_SAMPLE_TESTING_SET="Engelsk eksempeldata - Test"
 INSTL_SITE_INSTALL_SAMPLE_NONE_DESC="Installer Joomla med bare en meny og et innloggingsskjema, uten noe innhold."
 INSTL_SAMPLE_BLOG_SET_DESC="Installer Joomla med noen få artikler og blogg-relaterte moduler som 'Eldre innlegg', 'Bloggrull' og 'Mest lest'."
-INSTL_SAMPLE_BROCHURE_SET_DESC="Installer Joomla med noen få sider (en meny med sidene 'Hjem', 'Om oss', 'Nyheter' og 'Kontakt oss'), samt moduler som 'Søk', 'Egendfinert HTML' og 'Innlogging'."
+INSTL_SAMPLE_BROCHURE_SET_DESC="Installer Joomla med noen få sider (en meny med sidene 'Hjem', 'Om oss', 'Nyheter' og 'Kontakt oss'), samt moduler som 'Søk', 'Egendfinert' og 'Innlogging'."
 INSTL_SAMPLE_DATA_SET_DESC="Installer Joomla med en side (en meny med en lenke), samt moduler som 'Siste nyheter' og 'Innlogging'."
 INSTL_SAMPLE_LEARN_SET_DESC="Installer Joomla med eksempelartikler som forklarer hvordan systemet fungerer."
 INSTL_SAMPLE_TESTING_SET_DESC="Installer Joomla med alle mulige menytyper, for rask og enkel hjelp til testing av hele systemet."
@@ -116,19 +116,19 @@ INSTL_EMAIL_NOT_SENT="E-post kunne ikke sendes."
 
 ;Complete view
 INSTL_COMPLETE_ADMINISTRATION_LOGIN_DETAILS="Innloggingsdetaljer for administrasjonspanelet"
-; The word 'installation' should not be translated as it is a physical folder. Wtf do you know ...
+; The word 'installation' should not be translated as it is a physical folder.
 INSTL_COMPLETE_ERROR_FOLDER_ALREADY_REMOVED="Installasjonsmappen er allerede slettet."
-; The word 'installation' should not be translated as it is a physical folder. Wtf do you know ...
+; The word 'installation' should not be translated as it is a physical folder.
 INSTL_COMPLETE_ERROR_FOLDER_DELETE="Installasjonsmappen kunne ikke slettes, du må slette denne manuelt."
-; The word 'installation' should not be translated as it is a physical folder. Wtf do you know ...
+; The word 'installation' should not be translated as it is a physical folder.
 INSTL_COMPLETE_FOLDER_REMOVED="Installasjonsmappen ble slettet"
 INSTL_COMPLETE_LANGUAGE_1="Joomla! i ditt eget språk?"
-; The word 'installation' should not be translated as it is a physical folder. Wtf do you know ...
+; The word 'installation' should not be translated as it is a physical folder.
 INSTL_COMPLETE_LANGUAGE_DESC="Før du sletter installasjonsmappen kan du installere ekstra språk. Klikk følgende knapp dersom du ønsker å legge til ekstra språk for Joomla-installasjonen."
 INSTL_COMPLETE_LANGUAGE_DESC2="Merk: Installasjonsskriptet vil behøve tilgang til Internett for å kunne laste ned og installere flere språk. <br/>Noen serverkonfigurasjoner sperrer dessverre for dette. Dersom dette er tilfellet for deg er det ingen fare, du vil kunne installere flere språk senere via administrasjonspanelet."
-; The word 'installation' should not be translated as it is a physical folder. Wtf do you know ...
+; The word 'installation' should not be translated as it is a physical folder.
 INSTL_COMPLETE_REMOVE_FOLDER="Slett installasjonsmappen"
-; The word 'installation' should not be translated as it is a physical folder. Wtf do you know ...
+; The word 'installation' should not be translated as it is a physical folder.
 INSTL_COMPLETE_REMOVE_INSTALLATION="HUSK Å SLETTE INSTALLASJONSMAPPEN<br />Du vil ikke kunne bruke nettstedet før installasjonsmappen er slettet. Dette er en sikkerhetsfunksjon for Joomla!."
 INSTL_COMPLETE_TITLE="Gratulerer! Joomla! er nå installert."
 INSTL_COMPLETE_INSTALL_LANGUAGES="Ekstra steg: Installer språk"
@@ -319,3 +319,4 @@ POSTGRESQL="PostgreSQL"
 SQLAZURE="Microsoft SQL Azure"
 SQLITE="SQLite"
 SQLSRV="Microsoft SQL Server"
+
diff --git a/installation/language/nb-NO/nb-NO.xml b/installation/language/nb-NO/nb-NO.xml
index 92a41c91a724e..98e482c1235c9 100644
--- a/installation/language/nb-NO/nb-NO.xml
+++ b/installation/language/nb-NO/nb-NO.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <metafile
-	version="3.4"
+	version="3.5"
 	client="installation">
 	<name>Norwegian bokmål (nb-NO)</name>
-	<version>3.4.4</version>
+	<version>3.5.0</version>
 	<creationDate>August 2015</creationDate>
 	<author>Norsk Joomla!</author>
 	<copyright>Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved.</copyright>
diff --git a/installation/language/nn-NO/nn-NO.ini b/installation/language/nn-NO/nn-NO.ini
index 70f22b9f99fdb..15b802773a8db 100644
--- a/installation/language/nn-NO/nn-NO.ini
+++ b/installation/language/nn-NO/nn-NO.ini
@@ -87,7 +87,7 @@ INSTL_SAMPLE_LEARN_SET="Engelsk dømedata - Lær Joomla!"
 INSTL_SAMPLE_TESTING_SET="Engelsk dømedata - Test"
 INSTL_SITE_INSTALL_SAMPLE_NONE_DESC="Installer Joomla med berre ein meny og et innloggingsskjema, utan noko innhald."
 INSTL_SAMPLE_BLOG_SET_DESC="Installer Joomla med nokre få artiklar og blogg-relaterte modular som 'Eldre innlegg', 'Bloggrull' og 'Mest lest'."
-INSTL_SAMPLE_BROCHURE_SET_DESC="Installer Joomla med nokre få sider (ein meny med sidene 'Heim', 'Om oss', 'Nyhende' og 'Kontakt oss'), og dessutan modular som 'Søk', 'Egendfinert HTML' og 'Innlogging'."
+INSTL_SAMPLE_BROCHURE_SET_DESC="Installer Joomla med nokre få sider (ein meny med sidene 'Heim', 'Om oss', 'Nyhende' og 'Kontakt oss'), og dessutan modular som 'Søk', 'Egendfinert' og 'Innlogging'."
 INSTL_SAMPLE_DATA_SET_DESC="Installer Joomla med ei side (ein meny med ei lenkje), og dessutan modular som 'Siste nyhende' og 'Innlogging'."
 INSTL_SAMPLE_LEARN_SET_DESC="Installer Joomla med dømeartiklar som forklarer korleis systemet fungerer."
 INSTL_SAMPLE_TESTING_SET_DESC="Installer Joomla med alle moglege menytypar, for rask og enkel hjelp til testing av heile systemet."
@@ -116,13 +116,19 @@ INSTL_EMAIL_NOT_SENT="E-post kunne ikkje sendast."
 
 ;Complete view
 INSTL_COMPLETE_ADMINISTRATION_LOGIN_DETAILS="Innloggingsdetaljer for administrasjonspanelet"
+; The word 'installation' should not be translated as it is a physical folder.
 INSTL_COMPLETE_ERROR_FOLDER_ALREADY_REMOVED="Installasjonsmappa er allereie slettet."
+; The word 'installation' should not be translated as it is a physical folder.
 INSTL_COMPLETE_ERROR_FOLDER_DELETE="Installasjonsmappa kunne ikkje slettes, du må sletta denne manuelt."
+; The word 'installation' should not be translated as it is a physical folder.
 INSTL_COMPLETE_FOLDER_REMOVED="Installasjonsmappa vart slettet"
 INSTL_COMPLETE_LANGUAGE_1="Joomla! i ditt eige språk?"
+; The word 'installation' should not be translated as it is a physical folder.
 INSTL_COMPLETE_LANGUAGE_DESC="Før du slettar installasjonsmappa kan du installera ekstra språk. Klikkar følgjande knapp dersom du ynskjer å leggja til ekstra språk for Joomla-installasjonen."
 INSTL_COMPLETE_LANGUAGE_DESC2="Merk: Installasjonsskriptet vil trenga tilgjenge til Internett for å kunne lasta ned og installera fleire språk. <br/>Nokre serverkonfigurasjoner sperrar di verre for dette. Dersom dette er tilfellet for deg er det ingen fare, du vil kunna installera fleire språk seinare via administrasjonspanelet."
+; The word 'installation' should not be translated as it is a physical folder.
 INSTL_COMPLETE_REMOVE_FOLDER="Slett installasjonsmappa"
+; The word 'installation' should not be translated as it is a physical folder.
 INSTL_COMPLETE_REMOVE_INSTALLATION="HUGS Å SLETTA INSTALLASJONSMAPPA<br />Du vil ikkje kunna bruka nettstaden før installasjonsmappa er slettet. Dette er ein tryggleiksfunksjon for Joomla!."
 INSTL_COMPLETE_TITLE="Gratulerer! Joomla! er no installert."
 INSTL_COMPLETE_INSTALL_LANGUAGES="Ekstra steg: Installer språk"
@@ -312,4 +318,4 @@ PDOMYSQL="MySQL (PDO)"
 POSTGRESQL="PostgreSQL"
 SQLAZURE="Microsoft SQL Azure"
 SQLITE="SQLite"
-SQLSRV="Microsoft SQL Servar"
\ No newline at end of file
+SQLSRV="Microsoft SQL Servar"
diff --git a/installation/language/nn-NO/nn-NO.xml b/installation/language/nn-NO/nn-NO.xml
index 1e2f34b0b23fc..cd8c364fcdc70 100644
--- a/installation/language/nn-NO/nn-NO.xml
+++ b/installation/language/nn-NO/nn-NO.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <metafile
-	version="3.4"
+	version="3.5"
 	client="installation">
 	<name>Norwegian Nynorsk (nn-NO)</name>
-	<version>3.4.2</version>
+	<version>3.5.0</version>
 	<creationDate>2015-04-14</creationDate>
 	<author>Norsk Joomla and Skolelinux</author>
 	<copyright>Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved.</copyright>
diff --git a/installation/language/zh-CN/zh-CN.ini b/installation/language/zh-CN/zh-CN.ini
index e63578953faee..0f8ee184ccc6d 100644
--- a/installation/language/zh-CN/zh-CN.ini
+++ b/installation/language/zh-CN/zh-CN.ini
@@ -36,7 +36,7 @@ INSTL_DATABASE_NO_SCHEMA="没有该数据库类型的数据库模式（database
 INSTL_DATABASE_OLD_PROCESS_DESC="以前安装的joomla!在安装过程中将会被备份"
 INSTL_DATABASE_OLD_PROCESS_LABEL="旧数据的处理"
 INSTL_DATABASE_PASSWORD_DESC="为网站安全起见，请为mysql用户设置密码"
-INSTL_DATABASE_PASSWORD_LABEL="密码"
+INSTL_DATABASE_PASSWORD_LABEL="数据库密码"
 INSTL_DATABASE_PREFIX_DESC="为数据表选择一个前缀或者使用<b>随机产生的前缀</b>。理想的前缀是：三四个字符长度，仅包含字母并且以下划线结束。请确保数据库里的其它数据表没有使用该前缀。<b>一般也不要使用 &quot;bak_&quot; ，因该前缀常用于备份数据表。</b>"
 INSTL_DATABASE_PREFIX_LABEL="数据表前缀"
 INSTL_DATABASE_PREFIX_MSG="数据表前缀必须以字母开始，中间是数字或字母，最后以下划线结束。"
@@ -74,7 +74,7 @@ INSTL_ADMIN_USER_DESC="设置您网站超级管理员的用户名"
 INSTL_SITE_NAME_LABEL="网站名称"
 INSTL_SITE_NAME_DESC="请填写您的网站的名称。"
 INSTL_SITE_METADESC_LABEL="网站描述"
-INSTL_SITE_METADESC_TITLE_LABEL="请填写提供给搜索引擎的网站的描述。一般最好是20个字。"
+INSTL_SITE_METADESC_TITLE_LABEL="请填写提供给搜索引擎的网站的描述。一般针对谷歌最好是20个字。"
 INSTL_SITE_OFFLINE_LABEL="网站关闭"
 INSTL_SITE_OFFLINE_TITLE_LABEL="设置为完成安装后关闭网站前台。此后您可以随时通过全局配置开放网站。"
 INSTL_SITE_INSTALL_SAMPLE_LABEL="安装示范数据"
@@ -87,7 +87,7 @@ INSTL_SAMPLE_LEARN_SET="学习型Joomla示范数据（英文）"
 INSTL_SAMPLE_TESTING_SET="帮助测试示范数据（英文）"
 INSTL_SITE_INSTALL_SAMPLE_NONE_DESC="安装后只有一个菜单和一个登录表单，不安装任何示范内容。"
 INSTL_SAMPLE_BLOG_SET_DESC="安装后网站里将有类似博客的包含热门文章等等的基础排版。"
-INSTL_SAMPLE_BROCHURE_SET_DESC="安装后网站内容为手册风格。菜单有“首页”、“关于我们”、“新闻”、“联系我们”。模块有搜索、自定义HTML和登录框。"
+INSTL_SAMPLE_BROCHURE_SET_DESC="安装后网站内容为手册风格。菜单有“首页”、“关于我们”、“新闻”、“联系我们”。模块有搜索、自定义和登录框。"
 INSTL_SAMPLE_DATA_SET_DESC="安装后网站将只有一个页面（一个菜单项）和最新文章、登录框等模块。"
 INSTL_SAMPLE_LEARN_SET_DESC="安装后网站里将有一些文章介绍Joomla的基础概念。"
 INSTL_SAMPLE_TESTING_SET_DESC="安装所有的示范内容，便于全面测试Joomla。"
@@ -101,7 +101,7 @@ INSTL_SUMMARY_EMAIL_PASSWORDS_LABEL="在Email中包含密码。"
 INSTL_SUMMARY_EMAIL_PASSWORDS_DESC="警示：强烈建议您不要通过Email发送或保存密码。"
 
 ;Installing view
-INSTL_INSTALLING="安装中..."
+INSTL_INSTALLING="安装中……"
 INSTL_INSTALLING_DATABASE_BACKUP="旧数据表备份中"
 INSTL_INSTALLING_DATABASE_REMOVE="旧数据表删除中"
 INSTL_INSTALLING_DATABASE="数据表创建中"
@@ -116,14 +116,20 @@ INSTL_EMAIL_NOT_SENT="无法发送Email。"
 
 ;Complete view
 INSTL_COMPLETE_ADMINISTRATION_LOGIN_DETAILS="管理员登陆用的资料"
-INSTL_COMPLETE_ERROR_FOLDER_ALREADY_REMOVED="已删除安装目录。"
-INSTL_COMPLETE_ERROR_FOLDER_DELETE="安装目录无法删除，请手动删除。"
-INSTL_COMPLETE_FOLDER_REMOVED="安装目录成功移除。"
+; The word 'installation' should not be translated as it is a physical folder.
+INSTL_COMPLETE_ERROR_FOLDER_ALREADY_REMOVED="已删除目录installation。"
+; The word 'installation' should not be translated as it is a physical folder.
+INSTL_COMPLETE_ERROR_FOLDER_DELETE="目录installation无法删除，请手动删除。"
+; The word 'installation' should not be translated as it is a physical folder.
+INSTL_COMPLETE_FOLDER_REMOVED="成功删除目录installation。"
 INSTL_COMPLETE_LANGUAGE_1="创建使用您母语的网站及（或）自动创建多语言网站"
-INSTL_COMPLETE_LANGUAGE_DESC="删除安装文件夹前可为本站安装指定语言或多语言。请点击以下按钮："
+; The word 'installation' should not be translated as it is a physical folder.
+INSTL_COMPLETE_LANGUAGE_DESC="删除目录iinstallation前可为本站安装指定语言或多语言。请点击以下按钮："
 INSTL_COMPLETE_LANGUAGE_DESC2="提示：您将需要访问权限来允许Joomla下载和安装新的语言。<br/>有的服务器的配置不允许Joomla这样安装语言。如您遇到的正是这种情况，不用担心，您还能稍后通过登录Joomla管理后台来安装语言。"
-INSTL_COMPLETE_REMOVE_FOLDER="删除安装目录"
-INSTL_COMPLETE_REMOVE_INSTALLATION="请记住要彻底删除安装目录（installation）<br />在目录 &quot;installation&quot; 被删除之前，您无法进行下一步操作。这是Joomla!的一项安全功能。"
+; The word 'installation' should not be translated as it is a physical folder.
+INSTL_COMPLETE_REMOVE_FOLDER="删除目录installation"
+; The word 'installation' should not be translated as it is a physical folder.
+INSTL_COMPLETE_REMOVE_INSTALLATION="请记住要彻底删除目录installation<br />在目录 &quot;installation&quot; 被删除之前，您无法进行下一步操作。这是Joomla!的一项安全功能。"
 INSTL_COMPLETE_TITLE="恭喜！已经成功安装您的Joomla网站！"
 INSTL_COMPLETE_INSTALL_LANGUAGES="特别推荐：安装语言"
 
@@ -299,11 +305,11 @@ JNONE="无"
 
 ;Necessary for errors
 ADMIN_EMAIL="您的邮箱"
-ADMIN_PASSWORD="系统管理员密码"
-ADMIN_PASSWORD2="确认系统管理员密码"
+ADMIN_PASSWORD="管理员密码"
+ADMIN_PASSWORD2="确认管理员密码"
 SITE_NAME="网站名称"
 
-; 数据库类型 （允许一个比内部名称允许更具描述性的标签）
+; 数据库类型 （允许比内部名称允许更具描述性的标签）
 MYSQL="MySQL"
 MYSQLI="MySQLi"
 ORACLE="Oracle"
diff --git a/installation/language/zh-CN/zh-CN.xml b/installation/language/zh-CN/zh-CN.xml
index da36deb9d3eda..7d9a43c6a42bb 100644
--- a/installation/language/zh-CN/zh-CN.xml
+++ b/installation/language/zh-CN/zh-CN.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <metafile
-	version="3.4"
+	version="3.5"
 	client="installation">
 	<name>Chinese Simplified 简体中文</name>
-	<version>3.4.0</version>
+	<version>3.5.0</version>
 	<creationDate>2015.3.15</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>

From dbc02cb442b3fea49aec4d0e6a02f28105d9e5cb Mon Sep 17 00:00:00 2001
From: Jean-Marie Simonet <infografjms@gmail.com>
Date: Sat, 28 Nov 2015 08:18:00 +0100
Subject: [PATCH 143/176] Correcting smartsearch filter #8140

---
 .../com_finder/helpers/html/finder.php        |  2 +-
 .../com_finder/models/forms/filter_maps.xml   | 74 +++++++++----------
 .../language/en-GB/en-GB.com_finder.ini       |  2 +-
 3 files changed, 38 insertions(+), 40 deletions(-)

diff --git a/administrator/components/com_finder/helpers/html/finder.php b/administrator/components/com_finder/helpers/html/finder.php
index 6010102eee2c9..e702abfa3cba2 100644
--- a/administrator/components/com_finder/helpers/html/finder.php
+++ b/administrator/components/com_finder/helpers/html/finder.php
@@ -92,7 +92,7 @@ public static function mapslist()
 
 		// Compile the options.
 		$options = array();
-		$options[] = JHtml::_('select.option', '1', JText::_('COM_FINDER_MAPS_BRANCHES'));
+		$options[] = JHtml::_('select.option', '1', JText::_('COM_FINDER_MAPS_SELECT_BRANCH'));
 
 		foreach ($rows as $row)
 		{
diff --git a/administrator/components/com_finder/models/forms/filter_maps.xml b/administrator/components/com_finder/models/forms/filter_maps.xml
index be3b238805e94..ec70c76b34417 100644
--- a/administrator/components/com_finder/models/forms/filter_maps.xml
+++ b/administrator/components/com_finder/models/forms/filter_maps.xml
@@ -1,44 +1,42 @@
 <?xml version="1.0" encoding="utf-8"?>
 <form>
-    <fieldset addfieldpath="/administrator/components/com_templates/models/fields" />
+	<fieldset addfieldpath="/administrator/components/com_templates/models/fields" />
 
-    <fields name="filter">
-        <field
-                name="search"
-                type="text"
-                label="COM_FINDER_FILTER_SEARCH_DESC"
-                hint="JSEARCH_FILTER"
-                />
-        <field
-                name="state"
-                type="status"
-                filter="*,0,1"
-                label="COM_FINDER_FILTER_PUBLISHED"
-                description="COM_FINDER_FILTER_PUBLISHED_DESC"
-                onchange="this.form.submit();"
-                >
-            <option value="">JOPTION_SELECT_PUBLISHED</option>
-        </field>
+	<fields name="filter">
+		<field
+			name="search"
+			type="text"
+			label="COM_FINDER_FILTER_SEARCH_DESC"
+			hint="JSEARCH_FILTER"
+		/>
+		<field
+			name="state"
+				type="status"
+				filter="*,0,1"
+				label="COM_FINDER_FILTER_PUBLISHED"
+				description="COM_FINDER_FILTER_PUBLISHED_DESC"
+				onchange="this.form.submit();"
+				>
+			<option value="">JOPTION_SELECT_PUBLISHED</option>
+		</field>
 
-        <field
-                name="branch"
-                type="branches"
-                default="0"
-                onchange="this.form.submit();"
-                >
-            <option value="">COM_FINDER_MAPS_SELECT_BRANCHE</option>
-        </field>
+		<field
+			name="branch"
+			type="branches"
+			default="0"
+			onchange="this.form.submit();"
+		/>
 
-    </fields>
-    <fields name="list">
-        <field
-                name="limit"
-                type="limitbox"
-                class="input-mini"
-                default="25"
-                label="COM_FINDER_LIST_LIMIT"
-                description="COM_FINDER_LIST_LIMIT_DESC"
-                onchange="this.form.submit();"
-                />
-    </fields>
+	</fields>
+	<fields name="list">
+		<field
+			name="limit"
+			type="limitbox"
+			class="input-mini"
+			default="25"
+			label="COM_FINDER_LIST_LIMIT"
+			description="COM_FINDER_LIST_LIMIT_DESC"
+			onchange="this.form.submit();"
+		/>
+	</fields>
 </form>
diff --git a/administrator/language/en-GB/en-GB.com_finder.ini b/administrator/language/en-GB/en-GB.com_finder.ini
index bb2f65a92dc58..0a90c09300eb0 100644
--- a/administrator/language/en-GB/en-GB.com_finder.ini
+++ b/administrator/language/en-GB/en-GB.com_finder.ini
@@ -171,7 +171,7 @@ COM_FINDER_MAPS_CONFIRM_DELETE_PROMPT="Are you sure you want to delete the selec
 COM_FINDER_MAPS_MULTILANG="Note: Language filter system plugin has been enabled, so this branch will not be used."
 COM_FINDER_MAPS_NO_CONTENT="No results to display. Either no content has been indexed or no content meets your filter criteria."
 COM_FINDER_MAPS_RETURN_TO_BRANCHES="Return to Branches"
-COM_FINDER_MAPS_SELECT_BRANCHE="- Select Branch -"
+COM_FINDER_MAPS_SELECT_BRANCH="- Select Branch -"
 COM_FINDER_MAPS_SELECT_TYPE="- Select Type of Content -"
 COM_FINDER_MAPS_TOOLBAR_TITLE="Smart Search: Content Maps"
 COM_FINDER_MESSAGE_RETURNED="The following message was returned by the server:"

From ebcaa15726c94c93bdfe2fd2c665bd8c0c0919e0 Mon Sep 17 00:00:00 2001
From: Brian Teeman <brian@teeman.net>
Date: Sat, 28 Nov 2015 11:09:14 +0000
Subject: [PATCH 144/176] fix stripe

---
 .../components/com_finder/views/index/tmpl/default.php          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/administrator/components/com_finder/views/index/tmpl/default.php b/administrator/components/com_finder/views/index/tmpl/default.php
index d9ced32826403..e4101a9f800ba 100644
--- a/administrator/components/com_finder/views/index/tmpl/default.php
+++ b/administrator/components/com_finder/views/index/tmpl/default.php
@@ -113,7 +113,7 @@
 					<td>
 						<?php echo JHtml::_('jgrid.published', $item->published, $i, 'index.', $canChange, 'cb'); ?>
 					</td>
-					<td class="pull-left break-word">
+					<td class="break-word">
 						<label for="cb<?php echo $i ?>">
 							<strong>
 								<?php echo $this->escape($item->title); ?>

From 72fb424b44c868659e03008c784dc8e8fd9db61a Mon Sep 17 00:00:00 2001
From: photodude <photodude@users.noreply.github.com>
Date: Sun, 29 Nov 2015 16:39:50 -0700
Subject: [PATCH 145/176] Method documentation update.

Clarify method descriptions for mysql_affected_rows() and `mysql_affected_rows()`, and `mysql_num_rows()`
Note: `mysql_affected_rows()`, and `mysql_num_rows()` were deprecated in PHP 5.5.0, and were removed in PHP 7.0.0.
---
 libraries/joomla/database/driver/mysql.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libraries/joomla/database/driver/mysql.php b/libraries/joomla/database/driver/mysql.php
index 95dfe322a4a95..82ebca81eab4e 100644
--- a/libraries/joomla/database/driver/mysql.php
+++ b/libraries/joomla/database/driver/mysql.php
@@ -190,7 +190,7 @@ public function connected()
 	}
 
 	/**
-	 * Get the number of affected rows for the previous executed SQL statement.
+	 * Get the number of affected rows by the last INSERT, UPDATE, REPLACE or DELETE for the previous executed SQL statement.
 	 *
 	 * @return  integer  The number of affected rows.
 	 *
@@ -205,6 +205,8 @@ public function getAffectedRows()
 
 	/**
 	 * Get the number of returned rows for the previous executed SQL statement.
+	 * This command is only valid for statements like SELECT or SHOW that return an actual result set.
+	 * To retrieve the number of rows affected by a INSERT, UPDATE, REPLACE or DELETE query, use getAffectedRows().
 	 *
 	 * @param   resource  $cursor  An optional database cursor resource to extract the row count from.
 	 *

From 1360cfc5d05667e5672755e62e514f5bad1a74eb Mon Sep 17 00:00:00 2001
From: photodude <photodude@users.noreply.github.com>
Date: Sun, 29 Nov 2015 16:47:57 -0700
Subject: [PATCH 146/176] Method documentation update.

Clarify method descriptions for `getAffectedRows()` and `getNumRows()`
---
 libraries/joomla/database/driver/mysqli.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libraries/joomla/database/driver/mysqli.php b/libraries/joomla/database/driver/mysqli.php
index 22d3a6ace0acf..d78ef95cd9cd8 100644
--- a/libraries/joomla/database/driver/mysqli.php
+++ b/libraries/joomla/database/driver/mysqli.php
@@ -307,7 +307,7 @@ public function dropTable($tableName, $ifExists = true)
 	}
 
 	/**
-	 * Get the number of affected rows for the previous executed SQL statement.
+	 * Get the number of affected rows by the last INSERT, UPDATE, REPLACE or DELETE for the previous executed SQL statement.
 	 *
 	 * @return  integer  The number of affected rows.
 	 *
@@ -372,6 +372,8 @@ public function getConnectionCollation()
 
 	/**
 	 * Get the number of returned rows for the previous executed SQL statement.
+	 * This command is only valid for statements like SELECT or SHOW that return an actual result set.
+	 * To retrieve the number of rows affected by a INSERT, UPDATE, REPLACE or DELETE query, use getAffectedRows().
 	 *
 	 * @param   resource  $cursor  An optional database cursor resource to extract the row count from.
 	 *

From d7988847d1db515a6875ca488497c6453aed8dea Mon Sep 17 00:00:00 2001
From: photodude <photodude@users.noreply.github.com>
Date: Sun, 29 Nov 2015 17:00:07 -0700
Subject: [PATCH 147/176] Method documentation update.

Clarify method descriptions for `getNumRows()`
Note: with PDO `getNumRows()` "If the last SQL statement executed by the associated PDOStatement was a SELECT statement, some databases may return the number of rows returned by that statement. However, this behavior is not guaranteed for all databases and should not be relied on for portable applications." This is a deviation from the behavior for `getNumRows()` with mysql or mysqli where `getNumRows()` is only valid for statements like SELECT or SHOW
---
 libraries/joomla/database/driver/pdo.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libraries/joomla/database/driver/pdo.php b/libraries/joomla/database/driver/pdo.php
index 8ae77c713b17f..9a54af2bc8dde 100644
--- a/libraries/joomla/database/driver/pdo.php
+++ b/libraries/joomla/database/driver/pdo.php
@@ -629,6 +629,7 @@ public function getAffectedRows()
 
 	/**
 	 * Get the number of returned rows for the previous executed SQL statement.
+	 * Only applicable for DELETE, INSERT, or UPDATE statements.
 	 *
 	 * @param   resource  $cursor  An optional database cursor resource to extract the row count from.
 	 *

From 8cb96e968d71698df5bbbe055d9085138d576b9c Mon Sep 17 00:00:00 2001
From: photodude <photodude@users.noreply.github.com>
Date: Sun, 29 Nov 2015 17:16:02 -0700
Subject: [PATCH 148/176] Method documentation update.

Clarify method descriptions for `getAffectedRows()` and `getNumRows()`
---
 libraries/joomla/database/driver/postgresql.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libraries/joomla/database/driver/postgresql.php b/libraries/joomla/database/driver/postgresql.php
index f1e9c5d334751..e77f0c8a9f167 100644
--- a/libraries/joomla/database/driver/postgresql.php
+++ b/libraries/joomla/database/driver/postgresql.php
@@ -242,7 +242,7 @@ public function dropTable($tableName, $ifExists = true)
 	}
 
 	/**
-	 * Get the number of affected rows for the previous executed SQL statement.
+	 * Get the number of affected rows by the last INSERT, UPDATE, REPLACE or DELETE for the previous executed SQL statement.
 	 *
 	 * @return  integer  The number of affected rows in the previous operation
 	 *
@@ -286,6 +286,8 @@ public function getConnectionCollation()
 
 	/**
 	 * Get the number of returned rows for the previous executed SQL statement.
+	 * This command is only valid for statements like SELECT or SHOW that return an actual result set.
+	 * To retrieve the number of rows affected by a INSERT, UPDATE, REPLACE or DELETE query, use getAffectedRows().
 	 *
 	 * @param   resource  $cur  An optional database cursor resource to extract the row count from.
 	 *

From 1a98a82df8d4f65680e7867c70bcca1f4164345d Mon Sep 17 00:00:00 2001
From: George Wilson <georgejameswilson@googlemail.com>
Date: Wed, 2 Dec 2015 11:20:25 +0000
Subject: [PATCH 149/176] Fix wrong context for plugin event

---
 libraries/legacy/view/category.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/legacy/view/category.php b/libraries/legacy/view/category.php
index 7a80a2a8974af..3ed4a0d7e9b46 100644
--- a/libraries/legacy/view/category.php
+++ b/libraries/legacy/view/category.php
@@ -156,7 +156,7 @@ public function commonCategoryDisplay()
 			$dispatcher = JEventDispatcher::getInstance();
 			JPluginHelper::importPlugin('content');
 
-			$dispatcher->trigger('onContentPrepare', array ('com_contact.category', &$itemElement, &$itemElement->params, 0));
+			$dispatcher->trigger('onContentPrepare', array ($this->extension . '.category', &$itemElement, &$itemElement->params, 0));
 
 			$results = $dispatcher->trigger('onContentAfterTitle', array($this->extension . '.category', &$itemElement, &$itemElement->core_params, 0));
 			$itemElement->event->afterDisplayTitle = trim(implode("\n", $results));

From 5c19acf6bef687fd7fa8d009b26e12212dc94b4d Mon Sep 17 00:00:00 2001
From: Michael Babker <mbabker@flbab.com>
Date: Wed, 2 Dec 2015 12:06:22 -0500
Subject: [PATCH 150/176] Revert "Add plugin events to com_contact (redo) Fixes
 #8024"

This reverts commit 88fb40b7ad4bbc2d525c63cadfa8b62e1307fb96.
---
 .../views/categories/tmpl/default_items.php   | 12 +--
 .../views/category/tmpl/default_items.php     |  7 --
 .../com_contact/views/category/view.html.php  |  6 +-
 .../views/contact/tmpl/default.php            | 37 +++------
 .../com_contact/views/contact/view.html.php   | 82 ++++++-------------
 .../views/featured/tmpl/default.php           |  7 +-
 .../com_contact/views/featured/view.html.php  | 56 ++++++-------
 layouts/joomla/content/category_default.php   | 19 ++---
 libraries/legacy/view/category.php            | 30 +------
 .../html/com_contact/category/default.php     |  2 +-
 .../html/com_contact/contact/default.php      |  7 --
 .../html/com_contact/contact/encyclopedia.php |  5 --
 12 files changed, 86 insertions(+), 184 deletions(-)

diff --git a/components/com_contact/views/categories/tmpl/default_items.php b/components/com_contact/views/categories/tmpl/default_items.php
index 9d68a3ec4463f..ae2e2ca17863d 100644
--- a/components/com_contact/views/categories/tmpl/default_items.php
+++ b/components/com_contact/views/categories/tmpl/default_items.php
@@ -25,15 +25,17 @@
 			<div <?php echo $class; ?> >
 			<?php $class = ''; ?>
 				<h3 class="page-header item-title">
-					<a href="<?php echo JRoute::_(ContactHelperRoute::getCategoryRoute($item->id)); ?>">
+					<a href="<?php echo JRoute::_(ContactHelperRoute::getCategoryRoute($item->id, $item->language)); ?>">
 					<?php echo $this->escape($item->title); ?></a>
-					<?php if ($this->params->get('show_cat_num_articles_cat') == 1) :?>
+					<?php if ($this->params->get('show_cat_items_cat') == 1) :?>
 						<span class="badge badge-info tip hasTooltip" title="<?php echo JHtml::tooltipText('COM_CONTACT_NUM_ITEMS'); ?>">
+							<?php echo JText::_('COM_CONTACT_NUM_ITEMS'); ?>&nbsp;
 							<?php echo $item->numitems; ?>
 						</span>
 					<?php endif; ?>
-					<?php if (count($item->getChildren()) > 0) : ?>
-						<a href="#category-<?php echo $item->id;?>" data-toggle="collapse" data-toggle="button" class="btn btn-mini pull-right"><span class="icon-plus"></span></a>
+					<?php if (count($item->getChildren()) > 0 && $this->maxLevelcat > 1) : ?>
+						<a id="category-btn-<?php echo $item->id;?>" href="#category-<?php echo $item->id;?>"
+							data-toggle="collapse" data-toggle="button" class="btn btn-mini pull-right"><span class="icon-plus"></span></a>
 					<?php endif;?>
 				</h3>
 				<?php if ($this->params->get('show_subcat_desc_cat') == 1) :?>
@@ -44,7 +46,7 @@
 					<?php endif; ?>
 				<?php endif; ?>
 
-				<?php if (count($item->getChildren()) > 0) :?>
+				<?php if (count($item->getChildren()) > 0 && $this->maxLevelcat > 1) :?>
 					<div class="collapse fade" id="category-<?php echo $item->id;?>">
 						<?php
 						$this->items[$item->id] = $item->getChildren();
diff --git a/components/com_contact/views/category/tmpl/default_items.php b/components/com_contact/views/category/tmpl/default_items.php
index d74c57cd07904..8fe3c347bbd5e 100644
--- a/components/com_contact/views/category/tmpl/default_items.php
+++ b/components/com_contact/views/category/tmpl/default_items.php
@@ -71,11 +71,6 @@
 								<span class="label label-warning"><?php echo JText::_('JUNPUBLISHED'); ?></span>
 							<?php endif; ?>
 						</div>
-
-						<?php echo $item->event->afterDisplayTitle; ?>
-
-						<?php echo $item->event->beforeDisplayContent; ?>
-
 						<?php if ($this->params->get('show_position_headings')) : ?>
 								<?php echo $item->con_position; ?><br />
 						<?php endif; ?>
@@ -94,8 +89,6 @@
 							<?php echo $item->country; ?><br />
 						<?php endif; ?>
 					</div>
-
-					<?php echo $item->event->afterDisplayContent; ?>
 				</li>
 				<?php endif; ?>
 			<?php endforeach; ?>
diff --git a/components/com_contact/views/category/view.html.php b/components/com_contact/views/category/view.html.php
index afdf543e760e3..18f676c81526a 100644
--- a/components/com_contact/views/category/view.html.php
+++ b/components/com_contact/views/category/view.html.php
@@ -9,6 +9,8 @@
 
 defined('_JEXEC') or die;
 
+use Joomla\Registry\Registry;
+
 /**
  * HTML View class for the Contacts component
  *
@@ -49,8 +51,8 @@ public function display($tpl = null)
 		// Compute the contact slug.
 		foreach ($this->items as $item)
 		{
-			$item->slug	= $item->alias ? ($item->id . ':' . $item->alias) : $item->id;
-			$temp		= new JRegistry;
+			$item->slug = $item->alias ? ($item->id . ':' . $item->alias) : $item->id;
+			$temp       = new Registry;
 			$temp->loadString($item->params);
 			$item->params = clone($this->params);
 			$item->params->merge($temp);
diff --git a/components/com_contact/views/contact/tmpl/default.php b/components/com_contact/views/contact/tmpl/default.php
index ccc562678f939..8c6f4f7ed62b4 100644
--- a/components/com_contact/views/contact/tmpl/default.php
+++ b/components/com_contact/views/contact/tmpl/default.php
@@ -13,32 +13,27 @@
 
 jimport('joomla.html.html.bootstrap');
 ?>
-<div class="contact<?php echo $this->pageclass_sfx?>">
+<div class="contact<?php echo $this->pageclass_sfx?>" itemscope itemtype="http://schema.org/Person">
 	<?php if ($this->params->get('show_page_heading')) : ?>
 		<h1>
 			<?php echo $this->escape($this->params->get('page_heading')); ?>
 		</h1>
 	<?php endif; ?>
-
 	<?php if ($this->contact->name && $this->params->get('show_name')) : ?>
 		<div class="page-header">
 			<h2>
 				<?php if ($this->item->published == 0) : ?>
 					<span class="label label-warning"><?php echo JText::_('JUNPUBLISHED'); ?></span>
 				<?php endif; ?>
-				<span class="contact-name"><?php echo $this->contact->name; ?></span>
+				<span class="contact-name" itemprop="name"><?php echo $this->contact->name; ?></span>
 			</h2>
 		</div>
-	<?php endif; ?>
-
+	<?php endif;  ?>
 	<?php if ($this->params->get('show_contact_category') == 'show_no_link') : ?>
 		<h3>
 			<span class="contact-category"><?php echo $this->contact->category_title; ?></span>
 		</h3>
 	<?php endif; ?>
-
-	<?php echo $this->item->event->afterDisplayTitle; ?>
-
 	<?php if ($this->params->get('show_contact_category') == 'show_with_link') : ?>
 		<?php $contactLink = ContactHelperRoute::getCategoryRoute($this->contact->catid); ?>
 		<h3>
@@ -47,7 +42,6 @@
 			</span>
 		</h3>
 	<?php endif; ?>
-
 	<?php if ($this->params->get('show_contact_list') && count($this->contacts) > 1) : ?>
 		<form action="#" method="get" name="selectForm" id="selectForm">
 			<?php echo JText::_('COM_CONTACT_SELECT_CONTACT'); ?>
@@ -60,12 +54,9 @@
 		<?php echo $this->item->tagLayout->render($this->item->tags->itemTags); ?>
 	<?php endif; ?>
 
-	<?php echo $this->item->event->beforeDisplayContent; ?>
-
  	<?php if ($this->params->get('presentation_style') == 'sliders') : ?>
 		<?php echo JHtml::_('bootstrap.startAccordion', 'slide-contact', array('active' => 'basic-details')); ?>
 	<?php endif; ?>
-
 	<?php if ($this->params->get('presentation_style') == 'tabs') : ?>
 		<?php echo JHtml::_('bootstrap.startTabSet', 'myTab', array('active' => 'basic-details')); ?>
 	<?php endif; ?>
@@ -73,24 +64,22 @@
 	<?php if ($this->params->get('presentation_style') == 'sliders') : ?>
 		<?php echo JHtml::_('bootstrap.addSlide', 'slide-contact', JText::_('COM_CONTACT_DETAILS'), 'basic-details'); ?>
 	<?php endif; ?>
-
 	<?php if ($this->params->get('presentation_style') == 'tabs') : ?>
 		<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'basic-details', JText::_('COM_CONTACT_DETAILS', true)); ?>
 	<?php endif; ?>
-
 	<?php if ($this->params->get('presentation_style') == 'plain'):?>
 		<?php  echo '<h3>' . JText::_('COM_CONTACT_DETAILS') . '</h3>';  ?>
 	<?php endif; ?>
 
 	<?php if ($this->contact->image && $this->params->get('show_image')) : ?>
 		<div class="thumbnail pull-right">
-			<?php echo JHtml::_('image', $this->contact->image, JText::_('COM_CONTACT_IMAGE_DETAILS'), array('align' => 'middle')); ?>
+			<?php echo JHtml::_('image', $this->contact->image, JText::_('COM_CONTACT_IMAGE_DETAILS'), array('align' => 'middle', 'itemprop' => 'image')); ?>
 		</div>
 	<?php endif; ?>
 
 	<?php if ($this->contact->con_position && $this->params->get('show_position')) : ?>
 		<dl class="contact-position dl-horizontal">
-			<dd>
+			<dd itemprop="jobTitle">
 				<?php echo $this->contact->con_position; ?>
 			</dd>
 		</dl>
@@ -107,7 +96,6 @@
 	<?php if ($this->params->get('presentation_style') == 'sliders') : ?>
 		<?php echo JHtml::_('bootstrap.endSlide'); ?>
 	<?php endif; ?>
-
 	<?php if ($this->params->get('presentation_style') == 'tabs') : ?>
 		<?php echo JHtml::_('bootstrap.endTab'); ?>
 	<?php endif; ?>
@@ -120,7 +108,7 @@
 		<?php if ($this->params->get('presentation_style') == 'tabs') : ?>
 			<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'display-form', JText::_('COM_CONTACT_EMAIL_FORM', true)); ?>
 		<?php endif; ?>
-		<?php if ($this->params->get('presentation_style') == 'plain'): ?>
+		<?php if ($this->params->get('presentation_style') == 'plain'):?>
 			<?php echo '<h3>' . JText::_('COM_CONTACT_EMAIL_FORM') . '</h3>';  ?>
 		<?php endif; ?>
 
@@ -129,10 +117,10 @@
 		<?php if ($this->params->get('presentation_style') == 'sliders') : ?>
 			<?php echo JHtml::_('bootstrap.endSlide'); ?>
 		<?php endif; ?>
+			<?php if ($this->params->get('presentation_style') == 'tabs') : ?>
+		<?php echo JHtml::_('bootstrap.endTab'); ?>
+			<?php endif; ?>
 
-		<?php if ($this->params->get('presentation_style') == 'tabs') : ?>
-			<?php echo JHtml::_('bootstrap.endTab'); ?>
-		<?php endif; ?>
 	<?php endif; ?>
 
 	<?php if ($this->params->get('show_links')) : ?>
@@ -144,11 +132,9 @@
 		<?php if ($this->params->get('presentation_style') == 'sliders') : ?>
 			<?php echo JHtml::_('bootstrap.addSlide', 'slide-contact', JText::_('JGLOBAL_ARTICLES'), 'display-articles'); ?>
 		<?php endif; ?>
-
 		<?php if ($this->params->get('presentation_style') == 'tabs') : ?>
 			<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'display-articles', JText::_('JGLOBAL_ARTICLES', true)); ?>
 		<?php endif; ?>
-
 		<?php if ($this->params->get('presentation_style') == 'plain'):?>
 			<?php echo '<h3>' . JText::_('JGLOBAL_ARTICLES') . '</h3>';  ?>
 		<?php endif; ?>
@@ -158,7 +144,6 @@
 		<?php if ($this->params->get('presentation_style') == 'sliders') : ?>
 			<?php echo JHtml::_('bootstrap.endSlide'); ?>
 		<?php endif; ?>
-
 		<?php if ($this->params->get('presentation_style') == 'tabs') : ?>
 			<?php echo JHtml::_('bootstrap.endTab'); ?>
 		<?php endif; ?>
@@ -166,6 +151,7 @@
 	<?php endif; ?>
 
 	<?php if ($this->params->get('show_profile') && $this->contact->user_id && JPluginHelper::isEnabled('user', 'profile')) : ?>
+
 		<?php if ($this->params->get('presentation_style') == 'sliders') : ?>
 			<?php echo JHtml::_('bootstrap.addSlide', 'slide-contact', JText::_('COM_CONTACT_PROFILE'), 'display-profile'); ?>
 		<?php endif; ?>
@@ -184,9 +170,11 @@
 		<?php if ($this->params->get('presentation_style') == 'tabs') : ?>
 			<?php echo JHtml::_('bootstrap.endTab'); ?>
 		<?php endif; ?>
+
 	<?php endif; ?>
 
 	<?php if ($this->contact->misc && $this->params->get('show_misc')) : ?>
+
 		<?php if ($this->params->get('presentation_style') == 'sliders') : ?>
 			<?php echo JHtml::_('bootstrap.addSlide', 'slide-contact', JText::_('COM_CONTACT_OTHER_INFORMATION'), 'display-misc'); ?>
 		<?php endif; ?>
@@ -227,5 +215,4 @@
 	<?php if ($this->params->get('presentation_style') == 'tabs') : ?>
 		<?php echo JHtml::_('bootstrap.endTabSet'); ?>
 	<?php endif; ?>
-	<?php echo $this->item->event->afterDisplayContent; ?>
 </div>
diff --git a/components/com_contact/views/contact/view.html.php b/components/com_contact/views/contact/view.html.php
index 4ac6ff57309f6..6457f917f7e89 100644
--- a/components/com_contact/views/contact/view.html.php
+++ b/components/com_contact/views/contact/view.html.php
@@ -52,21 +52,19 @@ class ContactViewContact extends JViewLegacy
 	protected $return_page;
 
 	/**
-	 * Method to display the view.
+	 * Execute and display a template script.
 	 *
-	 * @param   string  $tpl  A template file to load. [optional]
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
 	 *
-	 * @return  mixed  Exception on failure, void on success.
-	 *
-	 * @since   1.5
+	 * @return  mixed  A string if successful, otherwise a Error object.
 	 */
 	public function display($tpl = null)
 	{
-		$app		= JFactory::getApplication();
-		$user		= JFactory::getUser();
-		$state		= $this->get('State');
-		$item		= $this->get('Item');
-		$this->form	= $this->get('Form');
+		$app        = JFactory::getApplication();
+		$user       = JFactory::getUser();
+		$state      = $this->get('State');
+		$item       = $this->get('Item');
+		$this->form = $this->get('Form');
 
 		// Get the parameters
 		$params = JComponentHelper::getParams('com_contact');
@@ -95,26 +93,26 @@ public function display($tpl = null)
 		}
 
 		// Check if access is not public
-		$groups	= $user->getAuthorisedViewLevels();
+		$groups = $user->getAuthorisedViewLevels();
 
 		$return = '';
 
 		if ((!in_array($item->access, $groups)) || (!in_array($item->category_access, $groups)))
 		{
-			JError::raiseWarning(403, JText::_('JERROR_ALERTNOAUTHOR'));
+			$app->enqueueMessage(JText::_('JERROR_ALERTNOAUTHOR'), 'error');
+			$app->setHeader('status', 403, true);
 
-			return false;
+			return;
 		}
 
-		$options['category_id']	= $item->catid;
-		$options['order by']	= 'a.default_con DESC, a.ordering ASC';
+		$options['category_id'] = $item->catid;
+		$options['order by']    = 'a.default_con DESC, a.ordering ASC';
 
 		// Handle email cloaking
 		if ($item->email_to && $params->get('show_email'))
 		{
 			$item->email_to = JHtml::_('email.cloak', $item->email_to);
 		}
-
 		if ($params->get('show_street_address') || $params->get('show_suburb') || $params->get('show_state')
 			|| $params->get('show_postcode') || $params->get('show_country'))
 		{
@@ -233,31 +231,6 @@ public function display($tpl = null)
 			$item->link = JRoute::_(ContactHelperRoute::getContactRoute($item->slug, $item->catid));
 		}
 
-		// Process the content plugins.
-		$dispatcher	= JEventDispatcher::getInstance();
-		JPluginHelper::importPlugin('content');
-		$offset = $state->get('list.offset');
-
-		// Fix for where some plugins require a text attribute
-		!empty($item->description)? $item->text = $item->description : $item->text = null;
-		$dispatcher->trigger('onContentPrepare', array ('com_contact.contact', &$item, &$this->params, $offset));
-
-		// Store the events for later
-		$item->event = new stdClass;
-		$results = $dispatcher->trigger('onContentAfterTitle', array('com_contact.contact', &$item, &$this->params, $offset));
-		$item->event->afterDisplayTitle = trim(implode("\n", $results));
-
-		$results = $dispatcher->trigger('onContentBeforeDisplay', array('com_contact.contact', &$item, &$this->params, $offset));
-		$item->event->beforeDisplayContent = trim(implode("\n", $results));
-
-		$results = $dispatcher->trigger('onContentAfterDisplay', array('com_contact.contact', &$item, &$this->params, $offset));
-		$item->event->afterDisplayContent = trim(implode("\n", $results));
-
-		if ($item->text)
-		{
-			$item->description = $item->text;
-		}
-
 		// Escape strings for HTML output
 		$this->pageclass_sfx = htmlspecialchars($params->get('pageclass_sfx'));
 
@@ -300,15 +273,13 @@ public function display($tpl = null)
 	 * Prepares the document
 	 *
 	 * @return  void
-	 *
-	 * @since   1.6
 	 */
 	protected function _prepareDocument()
 	{
-		$app		= JFactory::getApplication();
-		$menus		= $app->getMenu();
-		$pathway	= $app->getPathway();
-		$title 		= null;
+		$app     = JFactory::getApplication();
+		$menus   = $app->getMenu();
+		$pathway = $app->getPathway();
+		$title   = null;
 
 		// Because the application sets a default page title,
 		// we need to get it from the menu item itself
@@ -330,12 +301,12 @@ protected function _prepareDocument()
 		// If the menu item does not concern this contact
 		if ($menu && ($menu->query['option'] != 'com_contact' || $menu->query['view'] != 'contact' || $id != $this->item->id))
 		{
+
 			// If this is not a single contact menu item, set the page title to the contact title
 			if ($this->item->name)
 			{
 				$title = $this->item->name;
 			}
-
 			$path = array(array('title' => $this->contact->name, 'link' => ''));
 			$category = JCategories::getInstance('Contact')->get($this->contact->catid);
 
@@ -355,29 +326,28 @@ protected function _prepareDocument()
 
 		if (empty($title))
 		{
-			$title = $app->getCfg('sitename');
+			$title = $app->get('sitename');
 		}
-		elseif ($app->getCfg('sitename_pagetitles', 0) == 1)
+		elseif ($app->get('sitename_pagetitles', 0) == 1)
 		{
-			$title = JText::sprintf('JPAGETITLE', $app->getCfg('sitename'), $title);
+			$title = JText::sprintf('JPAGETITLE', $app->get('sitename'), $title);
 		}
-		elseif ($app->getCfg('sitename_pagetitles', 0) == 2)
+		elseif ($app->get('sitename_pagetitles', 0) == 2)
 		{
-			$title = JText::sprintf('JPAGETITLE', $title, $app->getCfg('sitename'));
+			$title = JText::sprintf('JPAGETITLE', $title, $app->get('sitename'));
 		}
 
 		if (empty($title))
 		{
 			$title = $this->item->name;
 		}
-
 		$this->document->setTitle($title);
 
 		if ($this->item->metadesc)
 		{
 			$this->document->setDescription($this->item->metadesc);
 		}
-		elseif (!$this->item->metadesc && $this->params->get('menu-meta_description'))
+		elseif ($this->params->get('menu-meta_description'))
 		{
 			$this->document->setDescription($this->params->get('menu-meta_description'));
 		}
@@ -386,7 +356,7 @@ protected function _prepareDocument()
 		{
 			$this->document->setMetadata('keywords', $this->item->metakey);
 		}
-		elseif (!$this->item->metakey && $this->params->get('menu-meta_keywords'))
+		elseif ($this->params->get('menu-meta_keywords'))
 		{
 			$this->document->setMetadata('keywords', $this->params->get('menu-meta_keywords'));
 		}
diff --git a/components/com_contact/views/featured/tmpl/default.php b/components/com_contact/views/featured/tmpl/default.php
index 87758e5cf52f4..54c4d15569712 100644
--- a/components/com_contact/views/featured/tmpl/default.php
+++ b/components/com_contact/views/featured/tmpl/default.php
@@ -22,7 +22,6 @@
 <?php endif; ?>
 
 <?php echo $this->loadTemplate('items'); ?>
-
 <?php if ($this->params->def('show_pagination', 2) == 1  || ($this->params->get('show_pagination') == 2 && $this->pagination->pagesTotal > 1)) : ?>
 	<div class="pagination">
 
@@ -30,9 +29,9 @@
 			<p class="counter">
 				<?php echo $this->pagination->getPagesCounter(); ?>
 			</p>
-		<?php endif; ?>
-
-		<?php echo $this->pagination->getPagesLinks(); ?>
+		<?php  endif; ?>
+				<?php echo $this->pagination->getPagesLinks(); ?>
 	</div>
 <?php endif; ?>
+
 </div>
diff --git a/components/com_contact/views/featured/view.html.php b/components/com_contact/views/featured/view.html.php
index dfd7a366f4d74..e1f60772e6bb1 100644
--- a/components/com_contact/views/featured/view.html.php
+++ b/components/com_contact/views/featured/view.html.php
@@ -12,7 +12,7 @@
 use Joomla\Registry\Registry;
 
 /**
- * Frontpage View class
+ * Featured View class
  *
  * @since  1.6
  */
@@ -61,32 +61,29 @@ class ContactViewFeatured extends JViewLegacy
 	protected $pagination;
 
 	/**
-	 * Method to display the view.
+	 * Display the view
 	 *
-	 * @param   string  $tpl  A template file to load. [optional]
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
 	 *
-	 * @return  mixed  Exception on failure, void on success.
-	 *
-	 * @since   1.6
+	 * @return  mixed  False on error, null otherwise.
 	 */
 	public function display($tpl = null)
 	{
-		$app		= JFactory::getApplication();
-		$params		= $app->getParams();
+		$app    = JFactory::getApplication();
+		$params = $app->getParams();
 
 		// Get some data from the models
-		$state		= $this->get('State');
-		$items		= $this->get('Items');
-		$category	= $this->get('Category');
-		$children	= $this->get('Children');
-		$parent 	= $this->get('Parent');
-		$pagination	= $this->get('Pagination');
+		$state      = $this->get('State');
+		$items      = $this->get('Items');
+		$category   = $this->get('Category');
+		$children   = $this->get('Children');
+		$parent     = $this->get('Parent');
+		$pagination = $this->get('Pagination');
 
 		// Check for errors.
 		if (count($errors = $this->get('Errors')))
 		{
 			JError::raiseWarning(500, implode("\n", $errors));
-
 			return false;
 		}
 
@@ -94,14 +91,13 @@ public function display($tpl = null)
 		// Compute the contact slug.
 		for ($i = 0, $n = count($items); $i < $n; $i++)
 		{
-			$item		= &$items[$i];
-			$item->slug	= $item->alias ? ($item->id . ':' . $item->alias) : $item->id;
-			$temp		= new Registry;
+			$item       = &$items[$i];
+			$item->slug = $item->alias ? ($item->id . ':' . $item->alias) : $item->id;
+			$temp       = new Registry;
 
 			$temp->loadString($item->params);
-			$item->params = clone $params;
+			$item->params = clone($params);
 			$item->params->merge($temp);
-
 			if ($item->params->get('show_email', 0) == 1)
 			{
 				$item->email_to = trim($item->email_to);
@@ -132,7 +128,7 @@ public function display($tpl = null)
 
 		$this->_prepareDocument();
 
-		return parent::display($tpl);
+		parent::display($tpl);
 	}
 
 	/**
@@ -140,13 +136,13 @@ public function display($tpl = null)
 	 *
 	 * @return  void
 	 *
-	 * @since   1.5
+	 * @since   1.6
 	 */
 	protected function _prepareDocument()
 	{
-		$app		= JFactory::getApplication();
-		$menus		= $app->getMenu();
-		$title 		= null;
+		$app   = JFactory::getApplication();
+		$menus = $app->getMenu();
+		$title = null;
 
 		// Because the application sets a default page title,
 		// we need to get it from the menu item itself
@@ -165,15 +161,15 @@ protected function _prepareDocument()
 
 		if (empty($title))
 		{
-			$title = $app->getCfg('sitename');
+			$title = $app->get('sitename');
 		}
-		elseif ($app->getCfg('sitename_pagetitles', 0) == 1)
+		elseif ($app->get('sitename_pagetitles', 0) == 1)
 		{
-			$title = JText::sprintf('JPAGETITLE', $app->getCfg('sitename'), $title);
+			$title = JText::sprintf('JPAGETITLE', $app->get('sitename'), $title);
 		}
-		elseif ($app->getCfg('sitename_pagetitles', 0) == 2)
+		elseif ($app->get('sitename_pagetitles', 0) == 2)
 		{
-			$title = JText::sprintf('JPAGETITLE', $title, $app->getCfg('sitename'));
+			$title = JText::sprintf('JPAGETITLE', $title, $app->get('sitename'));
 		}
 
 		$this->document->setTitle($title);
diff --git a/layouts/joomla/content/category_default.php b/layouts/joomla/content/category_default.php
index 96ce2012c8893..83af5deb83fd1 100644
--- a/layouts/joomla/content/category_default.php
+++ b/layouts/joomla/content/category_default.php
@@ -9,19 +9,15 @@
 
 defined('JPATH_BASE') or die;
 
-/**
- * Note that this layout opens a div with the page class suffix. If you do not use the category children
- * layout you need to close this div either by overriding this file or in your main layout.
- */
+// Note that this layout opens a div with the page class suffix. If you do not use the category children
+// layout you need to close this div either by overriding this file or in your main layout.
 $params    = $displayData->params;
 $extension = $displayData->get('category')->extension;
 $canEdit   = $params->get('access-edit');
 $className = substr($extension, 4);
 
-/**
- * This will work for the core components but not necessarily for other components
- * that may have different pluralisation rules.
- */
+// This will work for the core components but not necessarily for other components
+// that may have different pluralisation rules.
 if (substr($className, -1) == 's')
 {
 	$className = rtrim($className, 's');
@@ -35,24 +31,21 @@
 				<?php echo $displayData->escape($params->get('page_heading')); ?>
 			</h1>
 		<?php endif; ?>
-
-		<?php if ($params->get('show_category_title', 1)) : ?>
+		<?php if($params->get('show_category_title', 1)) : ?>
 			<h2>
 				<?php echo JHtml::_('content.prepare', $displayData->get('category')->title, '', $extension . '.category.title'); ?>
 			</h2>
 		<?php endif; ?>
-
 		<?php if ($params->get('show_cat_tags', 1)) : ?>
 			<?php echo JLayoutHelper::render('joomla.content.tags', $tagsData); ?>
 		<?php endif; ?>
-
 		<?php if ($params->get('show_description', 1) || $params->def('show_description_image', 1)) : ?>
 			<div class="category-desc">
 				<?php if ($params->get('show_description_image') && $displayData->get('category')->getParams()->get('image')) : ?>
 					<img src="<?php echo $displayData->get('category')->getParams()->get('image'); ?>" alt="<?php echo htmlspecialchars($displayData->get('category')->getParams()->get('image_alt')); ?>"/>
 				<?php endif; ?>
 				<?php if ($params->get('show_description') && $displayData->get('category')->description) : ?>
-					<?php echo JHtml::_('content.prepare', $displayData->get('category')->description, '', $extension . '.category.description'); ?>
+					<?php echo JHtml::_('content.prepare', $displayData->get('category')->description, '', $extension . '.category'); ?>
 				<?php endif; ?>
 				<div class="clr"></div>
 			</div>
diff --git a/libraries/legacy/view/category.php b/libraries/legacy/view/category.php
index 3ed4a0d7e9b46..2d4568c1de7ae 100644
--- a/libraries/legacy/view/category.php
+++ b/libraries/legacy/view/category.php
@@ -145,35 +145,7 @@ public function commonCategoryDisplay()
 		// Escape strings for HTML output
 		$this->pageclass_sfx = htmlspecialchars($params->get('pageclass_sfx'));
 
-		foreach ($items as $itemElement)
-		{
-			$itemElement = (object) $itemElement;
-			$itemElement->event = new stdClass;
-
-			// For some plugins.
-			!empty($itemElement->description)? $itemElement->text = $itemElement->description : $itemElement->text = null;
-
-			$dispatcher = JEventDispatcher::getInstance();
-			JPluginHelper::importPlugin('content');
-
-			$dispatcher->trigger('onContentPrepare', array ($this->extension . '.category', &$itemElement, &$itemElement->params, 0));
-
-			$results = $dispatcher->trigger('onContentAfterTitle', array($this->extension . '.category', &$itemElement, &$itemElement->core_params, 0));
-			$itemElement->event->afterDisplayTitle = trim(implode("\n", $results));
-
-			$results = $dispatcher->trigger('onContentBeforeDisplay', array($this->extension . '.category', &$itemElement, &$itemElement->core_params, 0));
-			$itemElement->event->beforeDisplayContent = trim(implode("\n", $results));
-
-			$results = $dispatcher->trigger('onContentAfterDisplay', array($this->extension . '.category', &$itemElement, &$itemElement->core_params, 0));
-			$itemElement->event->afterDisplayContent = trim(implode("\n", $results));
-
-			if ($itemElement->text)
-			{
-				$itemElement->description = $itemElement->text;
-			}
-		}
-
-		$maxLevel         = $params->get('maxLevel', -1) < 0 ? PHP_INT_MAX : $params->get('maxLevel', PHP_INT_MAX);
+		$maxLevel         = $params->get('maxLevel', -1);
 		$this->maxLevel   = &$maxLevel;
 		$this->state      = &$state;
 		$this->items      = &$items;
diff --git a/templates/beez3/html/com_contact/category/default.php b/templates/beez3/html/com_contact/category/default.php
index 04dc530a8b8a8..d309a661601bf 100644
--- a/templates/beez3/html/com_contact/category/default.php
+++ b/templates/beez3/html/com_contact/category/default.php
@@ -27,7 +27,7 @@
 		<img src="<?php echo $this->category->getParams()->get('image'); ?>"/>
 	<?php endif; ?>
 	<?php if ($this->params->get('show_description') && $this->category->description) : ?>
-		<?php echo JHtml::_('content.prepare', $this->category->description, '', 'com_contact.category.description'); ?>
+		<?php echo JHtml::_('content.prepare', $this->category->description, '', 'com_contact.category'); ?>
 	<?php endif; ?>
 	<div class="clr"></div>
 	</div>
diff --git a/templates/beez3/html/com_contact/contact/default.php b/templates/beez3/html/com_contact/contact/default.php
index 1e42b2af17732..2d19b51c172e0 100644
--- a/templates/beez3/html/com_contact/contact/default.php
+++ b/templates/beez3/html/com_contact/contact/default.php
@@ -38,9 +38,6 @@
 			</span>
 		</h3>
 	<?php endif; ?>
-
-	<?php echo $this->item->event->afterDisplayTitle; ?>
-
 	<?php if ($this->params->get('show_contact_list') && count($this->contacts) > 1) : ?>
 		<form action="#" method="get" name="selectForm" id="selectForm">
 			<?php echo JText::_('COM_CONTACT_SELECT_CONTACT'); ?>
@@ -53,8 +50,6 @@
 		<?php echo $this->item->tagLayout->render($this->item->tags->itemTags); ?>
 	<?php endif; ?>
 
-	<?php echo $this->item->event->beforeDisplayContent; ?>
-
 	<?php  if ($this->params->get('presentation_style') == 'sliders') : ?>
 		<?php echo JHtml::_('sliders.start', 'panel-sliders', array('useCookie' => '1')); ?>
 		<?php echo JHtml::_('sliders.panel', JText::_('COM_CONTACT_DETAILS'), 'basic-details'); ?>
@@ -171,6 +166,4 @@
 	<?php if ($this->params->get('presentation_style') == 'sliders') :
 		echo JHtml::_('sliders.end');
 	endif; ?>
-
-	<?php echo $this->item->event->afterDisplayContent; ?>
 </div>
diff --git a/templates/beez3/html/com_contact/contact/encyclopedia.php b/templates/beez3/html/com_contact/contact/encyclopedia.php
index d283c06dcdb7c..0257ee83c932b 100644
--- a/templates/beez3/html/com_contact/contact/encyclopedia.php
+++ b/templates/beez3/html/com_contact/contact/encyclopedia.php
@@ -24,10 +24,6 @@
 		</h2>
 	<?php endif;  ?>
 
-	<?php echo $this->item->event->afterDisplayTitle; ?>
-
-	<?php echo $this->item->event->beforeDisplayContent; ?>
-
 	<div class="encyclopedia_col1">
 		<?php if ($this->contact->image ) : ?>
 			<div class="contact-image">
@@ -77,4 +73,3 @@
 			<?php echo JHtml::_($this->params->get('presentation_style').'.end'); ?>
 			<?php endif; ?>
 </div>
-<?php echo $this->item->event->afterDisplayContent; ?>

From 3c968ff10443b6c59468d2b99ffa2598dda22bb8 Mon Sep 17 00:00:00 2001
From: wilsonge <georgejameswilson@googlemail.com>
Date: Wed, 2 Dec 2015 12:10:29 -0500
Subject: [PATCH 151/176] Add plugin events to com_contact (redo) Fixes #8024

---
 .../views/category/tmpl/default_items.php     |  7 ++++
 .../views/contact/tmpl/default.php            | 30 ++++++++++++-----
 .../com_contact/views/contact/view.html.php   | 33 +++++++++++++++++--
 .../views/featured/tmpl/default.php           |  7 ++--
 .../com_contact/views/featured/view.html.php  | 12 ++++---
 layouts/joomla/content/category_default.php   | 19 +++++++----
 libraries/legacy/view/category.php            | 30 ++++++++++++++++-
 .../html/com_contact/category/default.php     |  2 +-
 .../html/com_contact/contact/default.php      |  8 +++++
 .../html/com_contact/contact/encyclopedia.php |  5 +++
 10 files changed, 128 insertions(+), 25 deletions(-)

diff --git a/components/com_contact/views/category/tmpl/default_items.php b/components/com_contact/views/category/tmpl/default_items.php
index 8fe3c347bbd5e..d74c57cd07904 100644
--- a/components/com_contact/views/category/tmpl/default_items.php
+++ b/components/com_contact/views/category/tmpl/default_items.php
@@ -71,6 +71,11 @@
 								<span class="label label-warning"><?php echo JText::_('JUNPUBLISHED'); ?></span>
 							<?php endif; ?>
 						</div>
+
+						<?php echo $item->event->afterDisplayTitle; ?>
+
+						<?php echo $item->event->beforeDisplayContent; ?>
+
 						<?php if ($this->params->get('show_position_headings')) : ?>
 								<?php echo $item->con_position; ?><br />
 						<?php endif; ?>
@@ -89,6 +94,8 @@
 							<?php echo $item->country; ?><br />
 						<?php endif; ?>
 					</div>
+
+					<?php echo $item->event->afterDisplayContent; ?>
 				</li>
 				<?php endif; ?>
 			<?php endforeach; ?>
diff --git a/components/com_contact/views/contact/tmpl/default.php b/components/com_contact/views/contact/tmpl/default.php
index 8c6f4f7ed62b4..40286ba2cde8a 100644
--- a/components/com_contact/views/contact/tmpl/default.php
+++ b/components/com_contact/views/contact/tmpl/default.php
@@ -19,6 +19,7 @@
 			<?php echo $this->escape($this->params->get('page_heading')); ?>
 		</h1>
 	<?php endif; ?>
+
 	<?php if ($this->contact->name && $this->params->get('show_name')) : ?>
 		<div class="page-header">
 			<h2>
@@ -28,12 +29,16 @@
 				<span class="contact-name" itemprop="name"><?php echo $this->contact->name; ?></span>
 			</h2>
 		</div>
-	<?php endif;  ?>
+	<?php endif; ?>
+
 	<?php if ($this->params->get('show_contact_category') == 'show_no_link') : ?>
 		<h3>
 			<span class="contact-category"><?php echo $this->contact->category_title; ?></span>
 		</h3>
 	<?php endif; ?>
+
+	<?php echo $this->item->event->afterDisplayTitle; ?>
+
 	<?php if ($this->params->get('show_contact_category') == 'show_with_link') : ?>
 		<?php $contactLink = ContactHelperRoute::getCategoryRoute($this->contact->catid); ?>
 		<h3>
@@ -42,6 +47,7 @@
 			</span>
 		</h3>
 	<?php endif; ?>
+
 	<?php if ($this->params->get('show_contact_list') && count($this->contacts) > 1) : ?>
 		<form action="#" method="get" name="selectForm" id="selectForm">
 			<?php echo JText::_('COM_CONTACT_SELECT_CONTACT'); ?>
@@ -54,9 +60,12 @@
 		<?php echo $this->item->tagLayout->render($this->item->tags->itemTags); ?>
 	<?php endif; ?>
 
+	<?php echo $this->item->event->beforeDisplayContent; ?>
+
  	<?php if ($this->params->get('presentation_style') == 'sliders') : ?>
 		<?php echo JHtml::_('bootstrap.startAccordion', 'slide-contact', array('active' => 'basic-details')); ?>
 	<?php endif; ?>
+
 	<?php if ($this->params->get('presentation_style') == 'tabs') : ?>
 		<?php echo JHtml::_('bootstrap.startTabSet', 'myTab', array('active' => 'basic-details')); ?>
 	<?php endif; ?>
@@ -64,9 +73,11 @@
 	<?php if ($this->params->get('presentation_style') == 'sliders') : ?>
 		<?php echo JHtml::_('bootstrap.addSlide', 'slide-contact', JText::_('COM_CONTACT_DETAILS'), 'basic-details'); ?>
 	<?php endif; ?>
+
 	<?php if ($this->params->get('presentation_style') == 'tabs') : ?>
 		<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'basic-details', JText::_('COM_CONTACT_DETAILS', true)); ?>
 	<?php endif; ?>
+
 	<?php if ($this->params->get('presentation_style') == 'plain'):?>
 		<?php  echo '<h3>' . JText::_('COM_CONTACT_DETAILS') . '</h3>';  ?>
 	<?php endif; ?>
@@ -96,6 +107,7 @@
 	<?php if ($this->params->get('presentation_style') == 'sliders') : ?>
 		<?php echo JHtml::_('bootstrap.endSlide'); ?>
 	<?php endif; ?>
+
 	<?php if ($this->params->get('presentation_style') == 'tabs') : ?>
 		<?php echo JHtml::_('bootstrap.endTab'); ?>
 	<?php endif; ?>
@@ -108,7 +120,8 @@
 		<?php if ($this->params->get('presentation_style') == 'tabs') : ?>
 			<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'display-form', JText::_('COM_CONTACT_EMAIL_FORM', true)); ?>
 		<?php endif; ?>
-		<?php if ($this->params->get('presentation_style') == 'plain'):?>
+
+		<?php if ($this->params->get('presentation_style') == 'plain'): ?>
 			<?php echo '<h3>' . JText::_('COM_CONTACT_EMAIL_FORM') . '</h3>';  ?>
 		<?php endif; ?>
 
@@ -117,10 +130,10 @@
 		<?php if ($this->params->get('presentation_style') == 'sliders') : ?>
 			<?php echo JHtml::_('bootstrap.endSlide'); ?>
 		<?php endif; ?>
-			<?php if ($this->params->get('presentation_style') == 'tabs') : ?>
-		<?php echo JHtml::_('bootstrap.endTab'); ?>
-			<?php endif; ?>
 
+		<?php if ($this->params->get('presentation_style') == 'tabs') : ?>
+			<?php echo JHtml::_('bootstrap.endTab'); ?>
+		<?php endif; ?>
 	<?php endif; ?>
 
 	<?php if ($this->params->get('show_links')) : ?>
@@ -132,9 +145,11 @@
 		<?php if ($this->params->get('presentation_style') == 'sliders') : ?>
 			<?php echo JHtml::_('bootstrap.addSlide', 'slide-contact', JText::_('JGLOBAL_ARTICLES'), 'display-articles'); ?>
 		<?php endif; ?>
+
 		<?php if ($this->params->get('presentation_style') == 'tabs') : ?>
 			<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'display-articles', JText::_('JGLOBAL_ARTICLES', true)); ?>
 		<?php endif; ?>
+
 		<?php if ($this->params->get('presentation_style') == 'plain'):?>
 			<?php echo '<h3>' . JText::_('JGLOBAL_ARTICLES') . '</h3>';  ?>
 		<?php endif; ?>
@@ -144,6 +159,7 @@
 		<?php if ($this->params->get('presentation_style') == 'sliders') : ?>
 			<?php echo JHtml::_('bootstrap.endSlide'); ?>
 		<?php endif; ?>
+
 		<?php if ($this->params->get('presentation_style') == 'tabs') : ?>
 			<?php echo JHtml::_('bootstrap.endTab'); ?>
 		<?php endif; ?>
@@ -151,7 +167,6 @@
 	<?php endif; ?>
 
 	<?php if ($this->params->get('show_profile') && $this->contact->user_id && JPluginHelper::isEnabled('user', 'profile')) : ?>
-
 		<?php if ($this->params->get('presentation_style') == 'sliders') : ?>
 			<?php echo JHtml::_('bootstrap.addSlide', 'slide-contact', JText::_('COM_CONTACT_PROFILE'), 'display-profile'); ?>
 		<?php endif; ?>
@@ -170,11 +185,9 @@
 		<?php if ($this->params->get('presentation_style') == 'tabs') : ?>
 			<?php echo JHtml::_('bootstrap.endTab'); ?>
 		<?php endif; ?>
-
 	<?php endif; ?>
 
 	<?php if ($this->contact->misc && $this->params->get('show_misc')) : ?>
-
 		<?php if ($this->params->get('presentation_style') == 'sliders') : ?>
 			<?php echo JHtml::_('bootstrap.addSlide', 'slide-contact', JText::_('COM_CONTACT_OTHER_INFORMATION'), 'display-misc'); ?>
 		<?php endif; ?>
@@ -215,4 +228,5 @@
 	<?php if ($this->params->get('presentation_style') == 'tabs') : ?>
 		<?php echo JHtml::_('bootstrap.endTabSet'); ?>
 	<?php endif; ?>
+	<?php echo $this->item->event->afterDisplayContent; ?>
 </div>
diff --git a/components/com_contact/views/contact/view.html.php b/components/com_contact/views/contact/view.html.php
index 6457f917f7e89..b393e04757d2a 100644
--- a/components/com_contact/views/contact/view.html.php
+++ b/components/com_contact/views/contact/view.html.php
@@ -102,7 +102,7 @@ public function display($tpl = null)
 			$app->enqueueMessage(JText::_('JERROR_ALERTNOAUTHOR'), 'error');
 			$app->setHeader('status', 403, true);
 
-			return;
+			return false;
 		}
 
 		$options['category_id'] = $item->catid;
@@ -113,6 +113,7 @@ public function display($tpl = null)
 		{
 			$item->email_to = JHtml::_('email.cloak', $item->email_to);
 		}
+
 		if ($params->get('show_street_address') || $params->get('show_suburb') || $params->get('show_state')
 			|| $params->get('show_postcode') || $params->get('show_country'))
 		{
@@ -231,6 +232,31 @@ public function display($tpl = null)
 			$item->link = JRoute::_(ContactHelperRoute::getContactRoute($item->slug, $item->catid));
 		}
 
+		// Process the content plugins.
+		$dispatcher	= JEventDispatcher::getInstance();
+		JPluginHelper::importPlugin('content');
+		$offset = $state->get('list.offset');
+
+		// Fix for where some plugins require a text attribute
+		!empty($item->description)? $item->text = $item->description : $item->text = null;
+		$dispatcher->trigger('onContentPrepare', array ('com_contact.contact', &$item, &$this->params, $offset));
+
+		// Store the events for later
+		$item->event = new stdClass;
+		$results = $dispatcher->trigger('onContentAfterTitle', array('com_contact.contact', &$item, &$this->params, $offset));
+		$item->event->afterDisplayTitle = trim(implode("\n", $results));
+
+		$results = $dispatcher->trigger('onContentBeforeDisplay', array('com_contact.contact', &$item, &$this->params, $offset));
+		$item->event->beforeDisplayContent = trim(implode("\n", $results));
+
+		$results = $dispatcher->trigger('onContentAfterDisplay', array('com_contact.contact', &$item, &$this->params, $offset));
+		$item->event->afterDisplayContent = trim(implode("\n", $results));
+
+		if ($item->text)
+		{
+			$item->description = $item->text;
+		}
+
 		// Escape strings for HTML output
 		$this->pageclass_sfx = htmlspecialchars($params->get('pageclass_sfx'));
 
@@ -273,6 +299,8 @@ public function display($tpl = null)
 	 * Prepares the document
 	 *
 	 * @return  void
+	 *
+	 * @since   1.6
 	 */
 	protected function _prepareDocument()
 	{
@@ -301,12 +329,12 @@ protected function _prepareDocument()
 		// If the menu item does not concern this contact
 		if ($menu && ($menu->query['option'] != 'com_contact' || $menu->query['view'] != 'contact' || $id != $this->item->id))
 		{
-
 			// If this is not a single contact menu item, set the page title to the contact title
 			if ($this->item->name)
 			{
 				$title = $this->item->name;
 			}
+
 			$path = array(array('title' => $this->contact->name, 'link' => ''));
 			$category = JCategories::getInstance('Contact')->get($this->contact->catid);
 
@@ -341,6 +369,7 @@ protected function _prepareDocument()
 		{
 			$title = $this->item->name;
 		}
+
 		$this->document->setTitle($title);
 
 		if ($this->item->metadesc)
diff --git a/components/com_contact/views/featured/tmpl/default.php b/components/com_contact/views/featured/tmpl/default.php
index 54c4d15569712..87758e5cf52f4 100644
--- a/components/com_contact/views/featured/tmpl/default.php
+++ b/components/com_contact/views/featured/tmpl/default.php
@@ -22,6 +22,7 @@
 <?php endif; ?>
 
 <?php echo $this->loadTemplate('items'); ?>
+
 <?php if ($this->params->def('show_pagination', 2) == 1  || ($this->params->get('show_pagination') == 2 && $this->pagination->pagesTotal > 1)) : ?>
 	<div class="pagination">
 
@@ -29,9 +30,9 @@
 			<p class="counter">
 				<?php echo $this->pagination->getPagesCounter(); ?>
 			</p>
-		<?php  endif; ?>
-				<?php echo $this->pagination->getPagesLinks(); ?>
+		<?php endif; ?>
+
+		<?php echo $this->pagination->getPagesLinks(); ?>
 	</div>
 <?php endif; ?>
-
 </div>
diff --git a/components/com_contact/views/featured/view.html.php b/components/com_contact/views/featured/view.html.php
index e1f60772e6bb1..f00a1c593509c 100644
--- a/components/com_contact/views/featured/view.html.php
+++ b/components/com_contact/views/featured/view.html.php
@@ -61,11 +61,13 @@ class ContactViewFeatured extends JViewLegacy
 	protected $pagination;
 
 	/**
-	 * Display the view
+	 * Method to display the view.
 	 *
 	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
 	 *
-	 * @return  mixed  False on error, null otherwise.
+	 * @return  mixed  Exception on failure, void on success.
+	 *
+	 * @since   1.6
 	 */
 	public function display($tpl = null)
 	{
@@ -84,6 +86,7 @@ public function display($tpl = null)
 		if (count($errors = $this->get('Errors')))
 		{
 			JError::raiseWarning(500, implode("\n", $errors));
+
 			return false;
 		}
 
@@ -96,8 +99,9 @@ public function display($tpl = null)
 			$temp       = new Registry;
 
 			$temp->loadString($item->params);
-			$item->params = clone($params);
+			$item->params = clone $params;
 			$item->params->merge($temp);
+
 			if ($item->params->get('show_email', 0) == 1)
 			{
 				$item->email_to = trim($item->email_to);
@@ -128,7 +132,7 @@ public function display($tpl = null)
 
 		$this->_prepareDocument();
 
-		parent::display($tpl);
+		return parent::display($tpl);
 	}
 
 	/**
diff --git a/layouts/joomla/content/category_default.php b/layouts/joomla/content/category_default.php
index 83af5deb83fd1..96ce2012c8893 100644
--- a/layouts/joomla/content/category_default.php
+++ b/layouts/joomla/content/category_default.php
@@ -9,15 +9,19 @@
 
 defined('JPATH_BASE') or die;
 
-// Note that this layout opens a div with the page class suffix. If you do not use the category children
-// layout you need to close this div either by overriding this file or in your main layout.
+/**
+ * Note that this layout opens a div with the page class suffix. If you do not use the category children
+ * layout you need to close this div either by overriding this file or in your main layout.
+ */
 $params    = $displayData->params;
 $extension = $displayData->get('category')->extension;
 $canEdit   = $params->get('access-edit');
 $className = substr($extension, 4);
 
-// This will work for the core components but not necessarily for other components
-// that may have different pluralisation rules.
+/**
+ * This will work for the core components but not necessarily for other components
+ * that may have different pluralisation rules.
+ */
 if (substr($className, -1) == 's')
 {
 	$className = rtrim($className, 's');
@@ -31,21 +35,24 @@
 				<?php echo $displayData->escape($params->get('page_heading')); ?>
 			</h1>
 		<?php endif; ?>
-		<?php if($params->get('show_category_title', 1)) : ?>
+
+		<?php if ($params->get('show_category_title', 1)) : ?>
 			<h2>
 				<?php echo JHtml::_('content.prepare', $displayData->get('category')->title, '', $extension . '.category.title'); ?>
 			</h2>
 		<?php endif; ?>
+
 		<?php if ($params->get('show_cat_tags', 1)) : ?>
 			<?php echo JLayoutHelper::render('joomla.content.tags', $tagsData); ?>
 		<?php endif; ?>
+
 		<?php if ($params->get('show_description', 1) || $params->def('show_description_image', 1)) : ?>
 			<div class="category-desc">
 				<?php if ($params->get('show_description_image') && $displayData->get('category')->getParams()->get('image')) : ?>
 					<img src="<?php echo $displayData->get('category')->getParams()->get('image'); ?>" alt="<?php echo htmlspecialchars($displayData->get('category')->getParams()->get('image_alt')); ?>"/>
 				<?php endif; ?>
 				<?php if ($params->get('show_description') && $displayData->get('category')->description) : ?>
-					<?php echo JHtml::_('content.prepare', $displayData->get('category')->description, '', $extension . '.category'); ?>
+					<?php echo JHtml::_('content.prepare', $displayData->get('category')->description, '', $extension . '.category.description'); ?>
 				<?php endif; ?>
 				<div class="clr"></div>
 			</div>
diff --git a/libraries/legacy/view/category.php b/libraries/legacy/view/category.php
index 2d4568c1de7ae..3ed4a0d7e9b46 100644
--- a/libraries/legacy/view/category.php
+++ b/libraries/legacy/view/category.php
@@ -145,7 +145,35 @@ public function commonCategoryDisplay()
 		// Escape strings for HTML output
 		$this->pageclass_sfx = htmlspecialchars($params->get('pageclass_sfx'));
 
-		$maxLevel         = $params->get('maxLevel', -1);
+		foreach ($items as $itemElement)
+		{
+			$itemElement = (object) $itemElement;
+			$itemElement->event = new stdClass;
+
+			// For some plugins.
+			!empty($itemElement->description)? $itemElement->text = $itemElement->description : $itemElement->text = null;
+
+			$dispatcher = JEventDispatcher::getInstance();
+			JPluginHelper::importPlugin('content');
+
+			$dispatcher->trigger('onContentPrepare', array ($this->extension . '.category', &$itemElement, &$itemElement->params, 0));
+
+			$results = $dispatcher->trigger('onContentAfterTitle', array($this->extension . '.category', &$itemElement, &$itemElement->core_params, 0));
+			$itemElement->event->afterDisplayTitle = trim(implode("\n", $results));
+
+			$results = $dispatcher->trigger('onContentBeforeDisplay', array($this->extension . '.category', &$itemElement, &$itemElement->core_params, 0));
+			$itemElement->event->beforeDisplayContent = trim(implode("\n", $results));
+
+			$results = $dispatcher->trigger('onContentAfterDisplay', array($this->extension . '.category', &$itemElement, &$itemElement->core_params, 0));
+			$itemElement->event->afterDisplayContent = trim(implode("\n", $results));
+
+			if ($itemElement->text)
+			{
+				$itemElement->description = $itemElement->text;
+			}
+		}
+
+		$maxLevel         = $params->get('maxLevel', -1) < 0 ? PHP_INT_MAX : $params->get('maxLevel', PHP_INT_MAX);
 		$this->maxLevel   = &$maxLevel;
 		$this->state      = &$state;
 		$this->items      = &$items;
diff --git a/templates/beez3/html/com_contact/category/default.php b/templates/beez3/html/com_contact/category/default.php
index d309a661601bf..04dc530a8b8a8 100644
--- a/templates/beez3/html/com_contact/category/default.php
+++ b/templates/beez3/html/com_contact/category/default.php
@@ -27,7 +27,7 @@
 		<img src="<?php echo $this->category->getParams()->get('image'); ?>"/>
 	<?php endif; ?>
 	<?php if ($this->params->get('show_description') && $this->category->description) : ?>
-		<?php echo JHtml::_('content.prepare', $this->category->description, '', 'com_contact.category'); ?>
+		<?php echo JHtml::_('content.prepare', $this->category->description, '', 'com_contact.category.description'); ?>
 	<?php endif; ?>
 	<div class="clr"></div>
 	</div>
diff --git a/templates/beez3/html/com_contact/contact/default.php b/templates/beez3/html/com_contact/contact/default.php
index 2d19b51c172e0..deed9166e57c7 100644
--- a/templates/beez3/html/com_contact/contact/default.php
+++ b/templates/beez3/html/com_contact/contact/default.php
@@ -38,6 +38,9 @@
 			</span>
 		</h3>
 	<?php endif; ?>
+
+	<?php echo $this->item->event->afterDisplayTitle; ?>
+
 	<?php if ($this->params->get('show_contact_list') && count($this->contacts) > 1) : ?>
 		<form action="#" method="get" name="selectForm" id="selectForm">
 			<?php echo JText::_('COM_CONTACT_SELECT_CONTACT'); ?>
@@ -50,6 +53,8 @@
 		<?php echo $this->item->tagLayout->render($this->item->tags->itemTags); ?>
 	<?php endif; ?>
 
+	<?php echo $this->item->event->beforeDisplayContent; ?>
+
 	<?php  if ($this->params->get('presentation_style') == 'sliders') : ?>
 		<?php echo JHtml::_('sliders.start', 'panel-sliders', array('useCookie' => '1')); ?>
 		<?php echo JHtml::_('sliders.panel', JText::_('COM_CONTACT_DETAILS'), 'basic-details'); ?>
@@ -57,6 +62,7 @@
 	<?php  if ($this->params->get('presentation_style') == 'tabs') : ?>
 		<?php echo JHtmlTabs::start('tabs', array('useCookie' => '1')); ?>
 		<?php echo JHtmlTabs::panel(JText::_('COM_CONTACT_DETAILS'), 'basic-details'); ?>
+
 	<?php endif; ?>
 	<?php if ($this->params->get('presentation_style') == 'plain'):?>
 		<?php  echo '<h3>' . JText::_('COM_CONTACT_DETAILS') . '</h3>';  ?>
@@ -166,4 +172,6 @@
 	<?php if ($this->params->get('presentation_style') == 'sliders') :
 		echo JHtml::_('sliders.end');
 	endif; ?>
+
+	<?php echo $this->item->event->afterDisplayContent; ?>
 </div>
diff --git a/templates/beez3/html/com_contact/contact/encyclopedia.php b/templates/beez3/html/com_contact/contact/encyclopedia.php
index 0257ee83c932b..d283c06dcdb7c 100644
--- a/templates/beez3/html/com_contact/contact/encyclopedia.php
+++ b/templates/beez3/html/com_contact/contact/encyclopedia.php
@@ -24,6 +24,10 @@
 		</h2>
 	<?php endif;  ?>
 
+	<?php echo $this->item->event->afterDisplayTitle; ?>
+
+	<?php echo $this->item->event->beforeDisplayContent; ?>
+
 	<div class="encyclopedia_col1">
 		<?php if ($this->contact->image ) : ?>
 			<div class="contact-image">
@@ -73,3 +77,4 @@
 			<?php echo JHtml::_($this->params->get('presentation_style').'.end'); ?>
 			<?php endif; ?>
 </div>
+<?php echo $this->item->event->afterDisplayContent; ?>

From ec993d708b268566cdbb998c25cf269851195d98 Mon Sep 17 00:00:00 2001
From: Jean-Marie Simonet <infografjms@gmail.com>
Date: Sun, 6 Dec 2015 10:11:00 +0100
Subject: [PATCH 152/176] B/C readding missing string and alpha ordering new
 strings

---
 language/en-GB/en-GB.com_contact.ini | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/language/en-GB/en-GB.com_contact.ini b/language/en-GB/en-GB.com_contact.ini
index ecc50744b34b9..e011243c44bec 100644
--- a/language/en-GB/en-GB.com_contact.ini
+++ b/language/en-GB/en-GB.com_contact.ini
@@ -8,6 +8,7 @@ COM_CONTACT_ARTICLES_HEADING="Contact's articles"
 COM_CONTACT_CAPTCHA_LABEL="Captcha"
 COM_CONTACT_CAPTCHA_DESC="Type in the textbox what you see in the image."
 COM_CONTACT_CAT_NUM="# of Contacts :"
+COM_CONTACT_CONTACT_DEFAULT_LABEL="Send an Email"
 COM_CONTACT_CONTACT_EMAIL_A_COPY_DESC="Sends a copy of the message to the address you have supplied."
 COM_CONTACT_CONTACT_EMAIL_A_COPY_LABEL="Send copy to yourself"
 COM_CONTACT_CONTACT_EMAIL_NAME_DESC="Your name."
@@ -15,6 +16,7 @@ COM_CONTACT_CONTACT_EMAIL_NAME_LABEL="Name"
 COM_CONTACT_CONTACT_ENTER_MESSAGE_DESC="Enter your message here."
 COM_CONTACT_CONTACT_ENTER_MESSAGE_LABEL="Message"
 COM_CONTACT_CONTACT_ENTER_VALID_EMAIL="Please enter a valid email address."
+COM_CONTACT_CONTACT_REQUIRED="<strong class="_QQ_"red"_QQ_">*</strong> Required field"
 COM_CONTACT_CONTENT_TYPE_CONTACT="Contact"
 COM_CONTACT_CONTENT_TYPE_CATEGORY="Contact Category"
 COM_CONTACT_FILTER_LABEL="Filter Field"
@@ -38,7 +40,7 @@ COM_CONTACT_ENQUIRY_TEXT="This is an enquiry email via %s from:"
 COM_CONTACT_ERROR_CONTACT_NOT_FOUND="Contact not found"
 COM_CONTACT_FAX="Fax"
 COM_CONTACT_FAX_NUMBER="Fax: %s"
-COM_CONTACT_CONTACT_DEFAULT_LABEL="Send an Email"
+COM_CONTACT_FORM_LABEL="Send an Email. All fields with an asterisk (*) are required.
 COM_CONTACT_FORM_NC="Please make sure the form is complete and valid."
 COM_CONTACT_IMAGE_DETAILS="Contact image"
 COM_CONTACT_LINKS="Links"
@@ -48,7 +50,6 @@ COM_CONTACT_MOBILE_NUMBER="Mobile: %s"
 COM_CONTACT_NO_CONTACTS="There are no Contacts to display"
 COM_CONTACT_NOT_MORE_THAN_ONE_EMAIL_ADDRESS="You can't enter more than one email address."
 COM_CONTACT_NUM_ITEMS="Contact Count:"
-COM_CONTACT_CONTACT_REQUIRED="<strong class="_QQ_"red"_QQ_">*</strong> Required field"
 COM_CONTACT_OPTIONAL="(optional)"
 COM_CONTACT_OTHER_INFORMATION="Miscellaneous Information"
 COM_CONTACT_POSITION="Position"

From 331297ac3f7a5c1af4310947225434eeb48f1365 Mon Sep 17 00:00:00 2001
From: Thomas Hunziker <werbemails@bakual.ch>
Date: Sun, 6 Dec 2015 13:38:44 +0100
Subject: [PATCH 153/176] Fixing language file syntax (missing ")

---
 language/en-GB/en-GB.com_contact.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/language/en-GB/en-GB.com_contact.ini b/language/en-GB/en-GB.com_contact.ini
index e011243c44bec..59878e062bbaf 100644
--- a/language/en-GB/en-GB.com_contact.ini
+++ b/language/en-GB/en-GB.com_contact.ini
@@ -40,7 +40,7 @@ COM_CONTACT_ENQUIRY_TEXT="This is an enquiry email via %s from:"
 COM_CONTACT_ERROR_CONTACT_NOT_FOUND="Contact not found"
 COM_CONTACT_FAX="Fax"
 COM_CONTACT_FAX_NUMBER="Fax: %s"
-COM_CONTACT_FORM_LABEL="Send an Email. All fields with an asterisk (*) are required.
+COM_CONTACT_FORM_LABEL="Send an Email. All fields with an asterisk (*) are required."
 COM_CONTACT_FORM_NC="Please make sure the form is complete and valid."
 COM_CONTACT_IMAGE_DETAILS="Contact image"
 COM_CONTACT_LINKS="Links"

From 856f6a08f3b03dc1941e54d6e06f7d3b2bc39853 Mon Sep 17 00:00:00 2001
From: George Wilson <georgejameswilson@googlemail.com>
Date: Tue, 8 Dec 2015 15:34:06 +0000
Subject: [PATCH 154/176] Travis builds were failing

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 298c7c77e2b62..b25ed34a4f3ed 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -39,7 +39,7 @@ before_script:
   # Enable additional PHP extensions
   - if [ "$INSTALL_MEMCACHED" == "yes" ]; then phpenv config-add build/travis/phpenv/memcached.ini; fi
   - if [ "$INSTALL_APC" == "yes" ]; then phpenv config-add build/travis/phpenv/apc-$TRAVIS_PHP_VERSION.ini; fi
-  - if [ "$INSTALL_APCU_STABLE" == "yes" ]; then printf "\n" | pecl install apcu; fi
+  - if [ "$INSTALL_APCU_STABLE" == "yes" ]; then printf "\n" | pecl install apcu-4.0.10; fi
   - if [ "$INSTALL_APCU_BETA" == "yes" ]; then printf "\n" | pecl install apcu-beta; fi
   - if [ "$INSTALL_REDIS" == "yes" ]; then phpenv config-add build/travis/phpenv/redis.ini; fi
 

From 7f99ba176f4559b0d5bba72bb9556abdd5a2cda7 Mon Sep 17 00:00:00 2001
From: Dimitri Grammatikogianni <mit505@upshift.gr>
Date: Tue, 8 Dec 2015 18:39:58 +0100
Subject: [PATCH 155/176] travis again

---
 .travis.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b25ed34a4f3ed..b316709d4d65b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,9 +16,9 @@ matrix:
     - php: 5.4
       env: INSTALL_APC="yes"
     - php: 5.5
-      env: INSTALL_APCU_STABLE="yes"
+      env: INSTALL_APCU_BC="yes"
     - php: 5.6
-      env: RUN_PHPCS="yes" INSTALL_APCU_STABLE="yes"
+      env: RUN_PHPCS="yes" INSTALL_APCU_BC="yes"
     - php: 7.0
       env: INSTALL_APCU_BETA="yes" INSTALL_MEMCACHED="no" INSTALL_REDIS="no"
 
@@ -39,7 +39,7 @@ before_script:
   # Enable additional PHP extensions
   - if [ "$INSTALL_MEMCACHED" == "yes" ]; then phpenv config-add build/travis/phpenv/memcached.ini; fi
   - if [ "$INSTALL_APC" == "yes" ]; then phpenv config-add build/travis/phpenv/apc-$TRAVIS_PHP_VERSION.ini; fi
-  - if [ "$INSTALL_APCU_STABLE" == "yes" ]; then printf "\n" | pecl install apcu-4.0.10; fi
+  - if [ "$INSTALL_APCU_BC" == "yes" ]; then printf "\n" | pecl install apcu-4.0.10; fi
   - if [ "$INSTALL_APCU_BETA" == "yes" ]; then printf "\n" | pecl install apcu-beta; fi
   - if [ "$INSTALL_REDIS" == "yes" ]; then phpenv config-add build/travis/phpenv/redis.ini; fi
 

From 4347ae14215158a43ec2b480afa2d23b56a3f447 Mon Sep 17 00:00:00 2001
From: Dimitri Grammatikogianni <mit505@upshift.gr>
Date: Tue, 8 Dec 2015 18:44:19 +0100
Subject: [PATCH 156/176] Update .travis.yml

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index b316709d4d65b..d13995b153b7f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,7 +20,7 @@ matrix:
     - php: 5.6
       env: RUN_PHPCS="yes" INSTALL_APCU_BC="yes"
     - php: 7.0
-      env: INSTALL_APCU_BETA="yes" INSTALL_MEMCACHED="no" INSTALL_REDIS="no"
+      env: INSTALL_APCU_BC_BETA="yes" INSTALL_MEMCACHED="no" INSTALL_REDIS="no"
 
 services:
   - memcached

From b2f19bbf7a7e25632d77316ca12075c4c49ce0d7 Mon Sep 17 00:00:00 2001
From: Dimitri Grammatikogianni <mit505@upshift.gr>
Date: Tue, 8 Dec 2015 18:46:43 +0100
Subject: [PATCH 157/176] Update .travis.yml

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index d13995b153b7f..b316709d4d65b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,7 +20,7 @@ matrix:
     - php: 5.6
       env: RUN_PHPCS="yes" INSTALL_APCU_BC="yes"
     - php: 7.0
-      env: INSTALL_APCU_BC_BETA="yes" INSTALL_MEMCACHED="no" INSTALL_REDIS="no"
+      env: INSTALL_APCU_BETA="yes" INSTALL_MEMCACHED="no" INSTALL_REDIS="no"
 
 services:
   - memcached

From 1b39a61ee8638a3742d9162425166dffea321368 Mon Sep 17 00:00:00 2001
From: Dimitri Grammatikogianni <mit505@upshift.gr>
Date: Tue, 8 Dec 2015 18:58:09 +0100
Subject: [PATCH 158/176] Update .travis.yml

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index b316709d4d65b..d13995b153b7f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,7 +20,7 @@ matrix:
     - php: 5.6
       env: RUN_PHPCS="yes" INSTALL_APCU_BC="yes"
     - php: 7.0
-      env: INSTALL_APCU_BETA="yes" INSTALL_MEMCACHED="no" INSTALL_REDIS="no"
+      env: INSTALL_APCU_BC_BETA="yes" INSTALL_MEMCACHED="no" INSTALL_REDIS="no"
 
 services:
   - memcached

From a6753e1cf015ba1b704012f49a0784ccc245af9d Mon Sep 17 00:00:00 2001
From: Michael Babker <mbabker@flbab.com>
Date: Tue, 8 Dec 2015 13:45:38 -0500
Subject: [PATCH 159/176] Seriously fix Travis builds

---
 .travis.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d13995b153b7f..9c51d3429ea1b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,11 +16,11 @@ matrix:
     - php: 5.4
       env: INSTALL_APC="yes"
     - php: 5.5
-      env: INSTALL_APCU_BC="yes"
+      env: INSTALL_APCU="yes"
     - php: 5.6
-      env: RUN_PHPCS="yes" INSTALL_APCU_BC="yes"
+      env: RUN_PHPCS="yes" INSTALL_APCU="yes"
     - php: 7.0
-      env: INSTALL_APCU_BC_BETA="yes" INSTALL_MEMCACHED="no" INSTALL_REDIS="no"
+      env: INSTALL_APCU_BC_BETA="no" INSTALL_MEMCACHED="no" INSTALL_REDIS="no" # Disabled apcu_bc install until https://github.com/travis-ci/travis-ci/issues/5207 is resolved
 
 services:
   - memcached
@@ -39,8 +39,8 @@ before_script:
   # Enable additional PHP extensions
   - if [ "$INSTALL_MEMCACHED" == "yes" ]; then phpenv config-add build/travis/phpenv/memcached.ini; fi
   - if [ "$INSTALL_APC" == "yes" ]; then phpenv config-add build/travis/phpenv/apc-$TRAVIS_PHP_VERSION.ini; fi
-  - if [ "$INSTALL_APCU_BC" == "yes" ]; then printf "\n" | pecl install apcu-4.0.10; fi
-  - if [ "$INSTALL_APCU_BETA" == "yes" ]; then printf "\n" | pecl install apcu-beta; fi
+  - if [ "$INSTALL_APCU" == "yes" ]; then printf "\n" | pecl install apcu-4.0.10; fi
+  - if [ "$INSTALL_APCU_BC_BETA" == "yes" ]; then printf "\n" | pecl install apcu_bc-beta; fi
   - if [ "$INSTALL_REDIS" == "yes" ]; then phpenv config-add build/travis/phpenv/redis.ini; fi
 
 script:

From 50998746169cd0fb069489c929e3faa48e3459ee Mon Sep 17 00:00:00 2001
From: Jean-Marie Simonet <infografjms@gmail.com>
Date: Wed, 9 Dec 2015 10:23:18 +0100
Subject: [PATCH 160/176] RTL: correcting Protostar display Contact details

---
 administrator/templates/isis/css/template-rtl.css | 7 +++++++
 media/jui/css/bootstrap-rtl.css                   | 7 +++++++
 media/jui/less/bootstrap-rtl.less                 | 7 +++++++
 3 files changed, 21 insertions(+)

diff --git a/administrator/templates/isis/css/template-rtl.css b/administrator/templates/isis/css/template-rtl.css
index e0eab3600334b..a50d5fa4ca508 100644
--- a/administrator/templates/isis/css/template-rtl.css
+++ b/administrator/templates/isis/css/template-rtl.css
@@ -8562,7 +8562,14 @@ body {
 }
 .dl-horizontal dt {
 	float: right;
+	text-align: left;
+	clear: right;
+}
+.dl-horizontal dd {
+	margin-left: 0;
+	margin-right: 180px;
 }
+.dl-horizontal dt
 .profile> ul {
 	margin: 9px 25px 0 0;
 }
diff --git a/media/jui/css/bootstrap-rtl.css b/media/jui/css/bootstrap-rtl.css
index 53eae1552d74b..640911e0d16a0 100644
--- a/media/jui/css/bootstrap-rtl.css
+++ b/media/jui/css/bootstrap-rtl.css
@@ -437,7 +437,14 @@ body {
 }
 .dl-horizontal dt {
 	float: right;
+	text-align: left;
+	clear: right;
+}
+.dl-horizontal dd {
+	margin-left: 0;
+	margin-right: 180px;
 }
+.dl-horizontal dt
 .profile> ul {
 	margin: 9px 25px 0 0;
 }
diff --git a/media/jui/less/bootstrap-rtl.less b/media/jui/less/bootstrap-rtl.less
index b3cd0cc0444e2..2d87d48bfa30d 100644
--- a/media/jui/less/bootstrap-rtl.less
+++ b/media/jui/less/bootstrap-rtl.less
@@ -447,7 +447,14 @@ direction:rtl;
 }
 .dl-horizontal dt {
 	float: right;
+	text-align: left;
+	clear: right;
+}
+.dl-horizontal dd {
+	margin-left: 0;
+	margin-right: 180px;
 }
+.dl-horizontal dt
 .profile> ul {
 	margin: 9px 25px 0 0;
 }

From db1605f764837113f7d735ebebde0226c743a4dd Mon Sep 17 00:00:00 2001
From: bertmert <bertmert@users.noreply.github.com>
Date: Wed, 9 Dec 2015 11:01:25 +0100
Subject: [PATCH 161/176] Select Module. Shows always frontend modules

---
 administrator/components/com_modules/models/select.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/administrator/components/com_modules/models/select.php b/administrator/components/com_modules/models/select.php
index a2cd220b3174a..a0063b943e754 100644
--- a/administrator/components/com_modules/models/select.php
+++ b/administrator/components/com_modules/models/select.php
@@ -33,7 +33,7 @@ protected function populateState($ordering = null, $direction = null)
 		$app = JFactory::getApplication('administrator');
 
 		// Load the filter state.
-		$clientId = $app->getUserState('com_modules.modules.filter.client_id', 0);
+		$clientId = $app->getUserState('com_modules.modules.client_id', 0);
 		$this->setState('filter.client_id', (int) $clientId);
 
 		// Load the parameters.

From 15cc13aa26d51fe8bf9fbffea9a464c2b080fc13 Mon Sep 17 00:00:00 2001
From: Brian Teeman <brian@teeman.net>
Date: Wed, 9 Dec 2015 12:32:08 +0000
Subject: [PATCH 162/176] Update tag creation tooltip

---
 administrator/language/en-GB/en-GB.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/administrator/language/en-GB/en-GB.ini b/administrator/language/en-GB/en-GB.ini
index 49c527a4c3005..afaac13b93288 100644
--- a/administrator/language/en-GB/en-GB.ini
+++ b/administrator/language/en-GB/en-GB.ini
@@ -111,7 +111,7 @@ JSHOW="Show"
 JSITE="Site"
 JSUBMIT="Submit"
 JTAG="Tags"
-JTAG_DESC="Assign tags to content items. You may select a tag from the pre-defined list or enter your own by typing the name in the field and pressing enter."
+JTAG_DESC="Assign tags to content items. You may select a tag from the pre-defined list or enter a new tag by typing the name in the field and pressing enter."
 JTRASH="Trash"
 JTRASHED="Trashed"
 JTRUE="True"

From bc26b314e06d61d7c0b2b5d1cdee47e2205ccf1f Mon Sep 17 00:00:00 2001
From: Brian Teeman <brian@teeman.net>
Date: Wed, 9 Dec 2015 12:33:11 +0000
Subject: [PATCH 163/176] sync front end and back end

---
 language/en-GB/en-GB.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/language/en-GB/en-GB.ini b/language/en-GB/en-GB.ini
index 5cd00733f1dc6..5df1b9609e67b 100644
--- a/language/en-GB/en-GB.ini
+++ b/language/en-GB/en-GB.ini
@@ -87,7 +87,7 @@ JSITE="Site"
 JSTATUS="Status"
 JSUBMIT="Submit"
 JTAG="Tags"
-JTAG_DESC="Add and delete tags to an item."
+JTAG_DESC="Assign tags to content items. You may select a tag from the pre-defined list or enter a new tag by typing the name in the field and pressing enter."
 JTOOLBAR_VERSIONS="Versions"
 JTRASH="Trash"
 JTRASHED="Trashed"

From 4fd8ea9d3715dd992dc6cf3dd08ea6bc79f5d31e Mon Sep 17 00:00:00 2001
From: bertmert <bertmert@users.noreply.github.com>
Date: Wed, 9 Dec 2015 21:41:12 +0100
Subject: [PATCH 164/176] Ordering by headline fix

---
 .../views/contacts/tmpl/default.php            | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/administrator/components/com_contact/views/contacts/tmpl/default.php b/administrator/components/com_contact/views/contacts/tmpl/default.php
index 3601e5ff9030b..319913751577d 100644
--- a/administrator/components/com_contact/views/contacts/tmpl/default.php
+++ b/administrator/components/com_contact/views/contacts/tmpl/default.php
@@ -54,36 +54,36 @@
 				<thead>
 					<tr>
 						<th width="1%" class="nowrap center hidden-phone">
-							<?php echo JHtml::_('grid.sort', '<span class="icon-menu-2"></span>', 'a.ordering', $listDirn, $listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
+							<?php echo JHtml::_('searchtools.sort', '', 'a.ordering', $listDirn, $listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-menu-2'); ?>
 						</th>
 						<th width="1%" class="center">
 							<?php echo JHtml::_('grid.checkall'); ?>
 						</th>
 						<th width="1%" style="min-width:55px" class="nowrap center">
-							<?php echo JHtml::_('grid.sort', 'JSTATUS', 'a.published', $listDirn, $listOrder); ?>
+							<?php echo JHtml::_('searchtools.sort', 'JSTATUS', 'a.published', $listDirn, $listOrder); ?>
 						</th>
 						<th>
-							<?php echo JHtml::_('grid.sort', 'JGLOBAL_TITLE', 'a.name', $listDirn, $listOrder); ?>
+							<?php echo JHtml::_('searchtools.sort', 'JGLOBAL_TITLE', 'a.name', $listDirn, $listOrder); ?>
 						</th>
 						<th class="nowrap hidden-phone">
-							<?php echo JHtml::_('grid.sort', 'COM_CONTACT_FIELD_LINKED_USER_LABEL', 'ul.name', $listDirn, $listOrder); ?>
+							<?php echo JHtml::_('searchtools.sort', 'COM_CONTACT_FIELD_LINKED_USER_LABEL', 'ul.name', $listDirn, $listOrder); ?>
 						</th>
 						<th width="5%" class="nowrap hidden-phone">
-							<?php echo JHtml::_('grid.sort', 'JFEATURED', 'a.featured', $listDirn, $listOrder); ?>
+							<?php echo JHtml::_('searchtools.sort', 'JFEATURED', 'a.featured', $listDirn, $listOrder); ?>
 						</th>
 						<th width="10%" class="nowrap hidden-phone">
-							<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_ACCESS', 'a.access', $listDirn, $listOrder); ?>
+							<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_ACCESS', 'a.access', $listDirn, $listOrder); ?>
 						</th>
 						<?php if ($assoc) : ?>
 						<th width="5%" class="nowrap hidden-phone">
-							<?php echo JHtml::_('grid.sort', 'COM_CONTACT_HEADING_ASSOCIATION', 'association', $listDirn, $listOrder); ?>
+							<?php echo JHtml::_('searchtools.sort', 'COM_CONTACT_HEADING_ASSOCIATION', 'association', $listDirn, $listOrder); ?>
 						</th>
 						<?php endif;?>
 						<th width="5%" class="nowrap hidden-phone">
-							<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_LANGUAGE', 'a.language', $listDirn, $listOrder); ?>
+							<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_LANGUAGE', 'a.language', $listDirn, $listOrder); ?>
 						</th>
 						<th width="1%" class="nowrap hidden-phone">
-							<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_ID', 'a.id', $listDirn, $listOrder); ?>
+							<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_ID', 'a.id', $listDirn, $listOrder); ?>
 						</th>
 					</tr>
 				</thead>

From 565764f39cd3e7daeaa13f3b698075fb3f126c9a Mon Sep 17 00:00:00 2001
From: bertmert <bertmert@users.noreply.github.com>
Date: Wed, 9 Dec 2015 22:04:45 +0100
Subject: [PATCH 165/176] Language ordering. Wrong state fullordering list

---
 .../components/com_contact/models/forms/filter_contacts.xml   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/administrator/components/com_contact/models/forms/filter_contacts.xml b/administrator/components/com_contact/models/forms/filter_contacts.xml
index ab7561bfdcda0..2d59265f11283 100755
--- a/administrator/components/com_contact/models/forms/filter_contacts.xml
+++ b/administrator/components/com_contact/models/forms/filter_contacts.xml
@@ -80,8 +80,8 @@
 			<option value="a.access DESC">JGRID_HEADING_ACCESS_DESC</option>
 			<option value="ul.name ASC">COM_CONTACT_FIELD_LINKED_USER_LABEL_ASC</option>
 			<option value="ul.name DESC">COM_CONTACT_FIELD_LINKED_USER_LABEL_DESC</option>
-			<option value="language ASC">JGRID_HEADING_LANGUAGE_ASC</option>
-			<option value="language DESC">JGRID_HEADING_LANGUAGE_DESC</option>
+			<option value="a.language ASC">JGRID_HEADING_LANGUAGE_ASC</option>
+			<option value="a.language DESC">JGRID_HEADING_LANGUAGE_DESC</option>
 			<option value="a.id ASC">JGRID_HEADING_ID_ASC</option>
 			<option value="a.id DESC">JGRID_HEADING_ID_DESC</option>
 			<option value="a.featured ASC">JFEATURED_ASC</option>

From febfbe3da14f01aa08a77a95327c2ade8678a3ec Mon Sep 17 00:00:00 2001
From: Nicola Galgano <optimus4joomla@gmail.com>
Date: Thu, 10 Dec 2015 10:48:23 +0100
Subject: [PATCH 166/176] Debug console - Profile Information

Profile Information bars Time,Memory
Add time and memory info on each tooltip
---
 plugins/system/debug/debug.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/system/debug/debug.php b/plugins/system/debug/debug.php
index 60d4d81402160..47b5683ef3a50 100644
--- a/plugins/system/debug/debug.php
+++ b/plugins/system/debug/debug.php
@@ -582,13 +582,13 @@ protected function displayProfileInformation()
 			$bars[] = (object) array(
 				'width' => round($mark->time / ($totalTime / 100), 4),
 				'class' => $barClass,
-				'tip' => $mark->tip
+				'tip' => $mark->tip . ' ' . round($mark->time , 1) . ' ms'
 			);
 
 			$barsMem[] = (object) array(
 				'width' => round($mark->memory / ($totalMem / 100), 4),
 				'class' => $barClassMem,
-				'tip' => $mark->tip
+				'tip' => $mark->tip . ' ' . round($mark->memory , 3) .'  MB',
 			);
 
 			$htmlMarks[] = '<div>' . str_replace('label-time', $labelClass, str_replace('label-memory', $labelClassMem, $mark->html)) . '</div>';

From 37672b8dc1ae76caad6f36dcca9d08e230c27ef8 Mon Sep 17 00:00:00 2001
From: Nicola Galgano <optimus4joomla@gmail.com>
Date: Thu, 10 Dec 2015 11:19:04 +0100
Subject: [PATCH 167/176] travis fix

Space found before comma in function call
---
 plugins/system/debug/debug.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/system/debug/debug.php b/plugins/system/debug/debug.php
index 47b5683ef3a50..3825633779614 100644
--- a/plugins/system/debug/debug.php
+++ b/plugins/system/debug/debug.php
@@ -582,13 +582,13 @@ protected function displayProfileInformation()
 			$bars[] = (object) array(
 				'width' => round($mark->time / ($totalTime / 100), 4),
 				'class' => $barClass,
-				'tip' => $mark->tip . ' ' . round($mark->time , 1) . ' ms'
+				'tip' => $mark->tip . ' ' . round($mark->time, 1) . ' ms'
 			);
 
 			$barsMem[] = (object) array(
 				'width' => round($mark->memory / ($totalMem / 100), 4),
 				'class' => $barClassMem,
-				'tip' => $mark->tip . ' ' . round($mark->memory , 3) .'  MB',
+				'tip' => $mark->tip . ' ' . round($mark->memory, 3) . '  MB',
 			);
 
 			$htmlMarks[] = '<div>' . str_replace('label-time', $labelClass, str_replace('label-memory', $labelClassMem, $mark->html)) . '</div>';

From 4befc6378e23af43c631c27a2dddee8dc09a34d7 Mon Sep 17 00:00:00 2001
From: George Wilson <georgejameswilson@googlemail.com>
Date: Fri, 11 Dec 2015 15:49:28 +0000
Subject: [PATCH 168/176] Deal with fatal when XML Form can't be found

---
 administrator/components/com_users/models/user.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/administrator/components/com_users/models/user.php b/administrator/components/com_users/models/user.php
index 3ada3300eea20..b30326bbb26f3 100644
--- a/administrator/components/com_users/models/user.php
+++ b/administrator/components/com_users/models/user.php
@@ -877,9 +877,14 @@ public function getAssignedGroups($userId = null)
 
 		if (empty($userId))
 		{
-			$result = array();
+			$result   = array();
+			$form     = $this->getForm();
+			$groupIDs = array();
 
-			$groupsIDs = $this->getForm()->getValue('groups');
+			if ($form)
+			{
+				$groupsIDs = $form->getValue('groups');
+			}
 
 			if (!empty($groupsIDs))
 			{

From 296a70b49e5c680d8caa33aff80f8c3934a7851b Mon Sep 17 00:00:00 2001
From: Brian Teeman <brian@teeman.net>
Date: Sat, 12 Dec 2015 10:24:47 +0000
Subject: [PATCH 169/176] remove twitter

---
 administrator/language/en-GB/en-GB.tpl_isis.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/administrator/language/en-GB/en-GB.tpl_isis.ini b/administrator/language/en-GB/en-GB.tpl_isis.ini
index df123e1784b2c..241ec1aa6c480 100644
--- a/administrator/language/en-GB/en-GB.tpl_isis.ini
+++ b/administrator/language/en-GB/en-GB.tpl_isis.ini
@@ -35,4 +35,4 @@ TPL_ISIS_STATUS_TOP="Top"
 TPL_ISIS_STICKY_DESC="Optionally set the toolbar to a fixed (pinned) location."
 TPL_ISIS_STICKY_LABEL="Pinned Toolbar"
 TPL_ISIS_TOOLBAR="Toolbar"
-TPL_ISIS_XML_DESCRIPTION="Continuing the Egyptian god/goddess theme (Khepri from 1.5 and Hathor from 1.6), Isis is the Joomla 3 administrator template based on Bootstrap from Twitter and the launch of the Joomla User Interface library (JUI)."
+TPL_ISIS_XML_DESCRIPTION="Continuing the Egyptian god/goddess theme (Khepri from 1.5 and Hathor from 1.6), Isis is the Joomla 3 administrator template based on Bootstrap and the launch of the Joomla User Interface library (JUI)."

From 7baf257d91855cded7742c124387a0e1532e675a Mon Sep 17 00:00:00 2001
From: Brian Teeman <brian@teeman.net>
Date: Sat, 12 Dec 2015 10:25:11 +0000
Subject: [PATCH 170/176] Update en-GB.tpl_isis.sys.ini

---
 administrator/language/en-GB/en-GB.tpl_isis.sys.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/administrator/language/en-GB/en-GB.tpl_isis.sys.ini b/administrator/language/en-GB/en-GB.tpl_isis.sys.ini
index 024b811c3bd42..0905379e468d1 100644
--- a/administrator/language/en-GB/en-GB.tpl_isis.sys.ini
+++ b/administrator/language/en-GB/en-GB.tpl_isis.sys.ini
@@ -17,4 +17,4 @@ TPL_ISIS_POSITION_STATUS="Status"
 TPL_ISIS_POSITION_SUBMENU="Submenu"
 TPL_ISIS_POSITION_TITLE="Title"
 TPL_ISIS_POSITION_TOOLBAR="Toolbar"
-TPL_ISIS_XML_DESCRIPTION="Continuing the Egyptian god/goddess theme (Khepri from 1.5 and Hathor from 1.6), Isis is the Joomla 3 administrator template based on Bootstrap from Twitter and the launch of the Joomla User Interface library (JUI)."
+TPL_ISIS_XML_DESCRIPTION="Continuing the Egyptian god/goddess theme (Khepri from 1.5 and Hathor from 1.6), Isis is the Joomla 3 administrator template based on Bootstrap and the launch of the Joomla User Interface library (JUI)."

From 088bad29a796c019721d745f7cc6c630d874871c Mon Sep 17 00:00:00 2001
From: Brian Teeman <brian@teeman.net>
Date: Sat, 12 Dec 2015 10:25:54 +0000
Subject: [PATCH 171/176] Update en-GB.tpl_isis.sys.ini

---
 .../templates/isis/language/en-GB/en-GB.tpl_isis.sys.ini        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/administrator/templates/isis/language/en-GB/en-GB.tpl_isis.sys.ini b/administrator/templates/isis/language/en-GB/en-GB.tpl_isis.sys.ini
index 41f25471f7997..0905379e468d1 100644
--- a/administrator/templates/isis/language/en-GB/en-GB.tpl_isis.sys.ini
+++ b/administrator/templates/isis/language/en-GB/en-GB.tpl_isis.sys.ini
@@ -17,4 +17,4 @@ TPL_ISIS_POSITION_STATUS="Status"
 TPL_ISIS_POSITION_SUBMENU="Submenu"
 TPL_ISIS_POSITION_TITLE="Title"
 TPL_ISIS_POSITION_TOOLBAR="Toolbar"
-TPL_ISIS_XML_DESCRIPTION="Continuing the Egyptian god/goddess theme (Khepri from 1.5 and Hathor from 1.6), Isis is the Joomla 3 administrator template based on Bootstrap from Twitter and the launch of the Joomla User Interface library (JUI)."
\ No newline at end of file
+TPL_ISIS_XML_DESCRIPTION="Continuing the Egyptian god/goddess theme (Khepri from 1.5 and Hathor from 1.6), Isis is the Joomla 3 administrator template based on Bootstrap and the launch of the Joomla User Interface library (JUI)."

From 3fefe7110e43f98f9cadae3e6c8e2d84f7e318d5 Mon Sep 17 00:00:00 2001
From: Brian Teeman <brian@teeman.net>
Date: Sat, 12 Dec 2015 10:26:27 +0000
Subject: [PATCH 172/176] Update en-GB.tpl_isis.ini

---
 administrator/templates/isis/language/en-GB/en-GB.tpl_isis.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/administrator/templates/isis/language/en-GB/en-GB.tpl_isis.ini b/administrator/templates/isis/language/en-GB/en-GB.tpl_isis.ini
index 38c537e20286e..00cdb292beae8 100644
--- a/administrator/templates/isis/language/en-GB/en-GB.tpl_isis.ini
+++ b/administrator/templates/isis/language/en-GB/en-GB.tpl_isis.ini
@@ -35,4 +35,4 @@ TPL_ISIS_STATUS_TOP="Top"
 TPL_ISIS_STICKY_DESC="Optionally set the toolbar to a fixed (pinned) location."
 TPL_ISIS_STICKY_LABEL="Pinned Toolbar"
 TPL_ISIS_TOOLBAR="Toolbar"
-TPL_ISIS_XML_DESCRIPTION="Continuing the Egyptian god/goddess theme (Khepri from 1.5 and Hathor from 1.6), Isis is the Joomla 3 administrator template based on Bootstrap from Twitter and the launch of the Joomla User Interface library (JUI)."
+TPL_ISIS_XML_DESCRIPTION="Continuing the Egyptian god/goddess theme (Khepri from 1.5 and Hathor from 1.6), Isis is the Joomla 3 administrator template based on Bootstrap and the launch of the Joomla User Interface library (JUI)."

From d6446991a01edc2c694b23ad3820cb27c1ed419e Mon Sep 17 00:00:00 2001
From: Brian Teeman <brian@teeman.net>
Date: Sat, 12 Dec 2015 10:26:52 +0000
Subject: [PATCH 173/176] Update en-GB.tpl_protostar.ini

---
 language/en-GB/en-GB.tpl_protostar.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/language/en-GB/en-GB.tpl_protostar.ini b/language/en-GB/en-GB.tpl_protostar.ini
index 92ec745f14b2d..4e570e9bb4dcb 100644
--- a/language/en-GB/en-GB.tpl_protostar.ini
+++ b/language/en-GB/en-GB.tpl_protostar.ini
@@ -3,7 +3,7 @@
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
-TPL_PROTOSTAR_XML_DESCRIPTION="Continuing the space theme (Solarflare from 1.0 and Milkyway from 1.5), Protostar is the Joomla 3 site template based on Bootstrap from Twitter and the launch of the Joomla User Interface library (JUI)."
+TPL_PROTOSTAR_XML_DESCRIPTION="Continuing the space theme (Solarflare from 1.0 and Milkyway from 1.5), Protostar is the Joomla 3 site template based on Bootstrap and the launch of the Joomla User Interface library (JUI)."
 
 TPL_PROTOSTAR_BACKGROUND_COLOR_DESC="Choose a background colour for static layouts. If left blank the Default (#f4f6f7) is used."
 TPL_PROTOSTAR_BACKGROUND_COLOR_LABEL="Background Colour"

From 1ab1ccbdb3039d155fd6629027a4690b041367d6 Mon Sep 17 00:00:00 2001
From: Brian Teeman <brian@teeman.net>
Date: Sat, 12 Dec 2015 10:27:12 +0000
Subject: [PATCH 174/176] Update en-GB.tpl_protostar.sys.ini

---
 language/en-GB/en-GB.tpl_protostar.sys.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/language/en-GB/en-GB.tpl_protostar.sys.ini b/language/en-GB/en-GB.tpl_protostar.sys.ini
index 18ff60c7c05f6..f90e7f8e2c2e9 100644
--- a/language/en-GB/en-GB.tpl_protostar.sys.ini
+++ b/language/en-GB/en-GB.tpl_protostar.sys.ini
@@ -22,4 +22,4 @@ TPL_PROTOSTAR_POSITION_POSITION-7="Right"
 TPL_PROTOSTAR_POSITION_POSITION-8="Left"
 TPL_PROTOSTAR_POSITION_POSITION-9="Unused"
 TPL_PROTOSTAR_POSITION_FOOTER="Footer"
-TPL_PROTOSTAR_XML_DESCRIPTION="Continuing the space theme (Solarflare from 1.0 and Milkyway from 1.5), Protostar is the Joomla 3 site template based on Bootstrap from Twitter and the launch of the Joomla User Interface library (JUI)."
+TPL_PROTOSTAR_XML_DESCRIPTION="Continuing the space theme (Solarflare from 1.0 and Milkyway from 1.5), Protostar is the Joomla 3 site template based on Bootstrap and the launch of the Joomla User Interface library (JUI)."

From f3f7d36afd1b17f70d50f006eb460341f86b8a1c Mon Sep 17 00:00:00 2001
From: Brian Teeman <brian@teeman.net>
Date: Sat, 12 Dec 2015 10:27:40 +0000
Subject: [PATCH 175/176] Update en-GB.tpl_protostar.ini

---
 templates/protostar/language/en-GB/en-GB.tpl_protostar.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/protostar/language/en-GB/en-GB.tpl_protostar.ini b/templates/protostar/language/en-GB/en-GB.tpl_protostar.ini
index 842766f06493e..8e9cc99cbffe5 100644
--- a/templates/protostar/language/en-GB/en-GB.tpl_protostar.ini
+++ b/templates/protostar/language/en-GB/en-GB.tpl_protostar.ini
@@ -3,7 +3,7 @@
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
-TPL_PROTOSTAR_XML_DESCRIPTION="Continuing the space theme (Solarflare from 1.0 and Milkyway from 1.5), Protostar is the Joomla 3 site template based on Bootstrap from Twitter and the launch of the Joomla User Interface library (JUI)."
+TPL_PROTOSTAR_XML_DESCRIPTION="Continuing the space theme (Solarflare from 1.0 and Milkyway from 1.5), Protostar is the Joomla 3 site template based on Bootstrap and the launch of the Joomla User Interface library (JUI)."
 
 TPL_PROTOSTAR_BACKGROUND_COLOR_DESC="Choose a background colour for static layouts. If left blank the Default (#f4f6f7) is used."
 TPL_PROTOSTAR_BACKGROUND_COLOR_LABEL="Background Colour"

From a47a0a051735fd4df8513572db0250ef0a375095 Mon Sep 17 00:00:00 2001
From: Brian Teeman <brian@teeman.net>
Date: Sat, 12 Dec 2015 10:27:56 +0000
Subject: [PATCH 176/176] Update en-GB.tpl_protostar.sys.ini

---
 templates/protostar/language/en-GB/en-GB.tpl_protostar.sys.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/protostar/language/en-GB/en-GB.tpl_protostar.sys.ini b/templates/protostar/language/en-GB/en-GB.tpl_protostar.sys.ini
index ebcf24e898dc3..043cc43e29ea0 100644
--- a/templates/protostar/language/en-GB/en-GB.tpl_protostar.sys.ini
+++ b/templates/protostar/language/en-GB/en-GB.tpl_protostar.sys.ini
@@ -22,4 +22,4 @@ TPL_PROTOSTAR_POSITION_POSITION-7="Right"
 TPL_PROTOSTAR_POSITION_POSITION-8="Left"
 TPL_PROTOSTAR_POSITION_POSITION-9="Unused"
 TPL_PROTOSTAR_POSITION_FOOTER="Footer"
-TPL_PROTOSTAR_XML_DESCRIPTION="Continuing the space theme (Solarflare from 1.0 and Milkyway from 1.5), Protostar is the Joomla 3 site template based on Bootstrap from Twitter and the launch of the Joomla User Interface library (JUI)."
+TPL_PROTOSTAR_XML_DESCRIPTION="Continuing the space theme (Solarflare from 1.0 and Milkyway from 1.5), Protostar is the Joomla 3 site template based on Bootstrap and the launch of the Joomla User Interface library (JUI)."