Merge branch 'staging' into com_finder_branch_filter

.travis.yml

@@ -11,6 +11,7 @@ env:
     - INSTALL_REDIS="yes"
 
 matrix:
+  fast_finish: true
   include:
     - php: 5.3
       env: INSTALL_APC="yes"
@@ -23,6 +24,18 @@ matrix:
     - php: 7.0
       env: INSTALL_APCU="yes" INSTALL_APCU_BC_BETA="no" INSTALL_MEMCACHE="no" INSTALL_MEMCACHED="no" INSTALL_REDIS="no" # Disabled apcu_bc install until https://github.com/travis-ci/travis-ci/issues/5207 is resolved
     - php: hhvm
+      sudo: true
+      dist: trusty
+      group: edge # until the next update
+      addons:
+        apt:
+          packages:
+            - mysql-server-5.6
+            - mysql-client-core-5.6
+            - mysql-client-5.6
+      services:
+        - mysql
+        - postgresql
       env: INSTALL_APCU_BC_BETA="no" INSTALL_MEMCACHE="no" INSTALL_MEMCACHED="no" INSTALL_REDIS="no" # Disabled items that currently do not work in travis-ci hhvm
   allow_failures:
     - php: hhvm
@@ -36,8 +49,10 @@ before_script:
   # Make sure all dev dependencies are installed
   - composer install
   # Set up databases for testing
-  - mysql -e 'create database joomla_ut;'
-  - mysql joomla_ut < tests/unit/schema/mysql.sql
+  - if [[ $TRAVIS_PHP_VERSION != hhvm ]]; then mysql -e 'create database joomla_ut;'; fi
+  - if [[ $TRAVIS_PHP_VERSION != hhvm ]]; then mysql joomla_ut < tests/unit/schema/mysql.sql; fi
+  - if [[ $TRAVIS_PHP_VERSION = hhvm ]]; then mysql -u root -e 'create database joomla_ut;'; fi
+  - if [[ $TRAVIS_PHP_VERSION = hhvm ]]; then mysql -u root joomla_ut < tests/unit/schema/mysql.sql; fi
   - psql -c 'create database joomla_ut;' -U postgres
   - psql -d joomla_ut -a -f tests/unit/schema/postgresql.sql
   # Set up Apache

README.md

@@ -10,7 +10,7 @@ What is this?
 ---------------------
 * This is a Joomla! 3.x installation/upgrade package.
 * Joomla's [Official website](https://www.joomla.org).
-* Joomla! 3.5 [version history](https://docs.joomla.org/Joomla_3.5_version_history).
+* Joomla! 3.6 [version history](https://docs.joomla.org/Joomla_3.6_version_history).
 * Detailed changes are in the [changelog](https://github.com/joomla/joomla-cms/commits/master).
 
 What is Joomla?

README.txt

@@ -1,7 +1,7 @@
 1- What is this?
 	* This is a Joomla! installation/upgrade package to version 3.x
 	* Joomla! Official site: https://www.joomla.org
-	* Joomla! 3.5 version history - https://docs.joomla.org/Joomla_3.5_version_history
+	* Joomla! 3.6 version history - https://docs.joomla.org/Joomla_3.6_version_history
 	* Detailed changes in the Changelog: https://github.com/joomla/joomla-cms/commits/master
 
 2- What is Joomla?

administrator/components/com_banners/models/clients.php

@@ -60,7 +60,7 @@ protected function populateState($ordering = 'a.name', $direction = 'asc')
 	{
 		// Load the filter state.
 		$this->setState('filter.search', $this->getUserStateFromRequest($this->context . '.filter.search', 'filter_search', '', 'string'));
-		$this->setState('filter.state', $this->getUserStateFromRequest($this->context . '.filter.state', 'filter_state', null, 'int'));
+		$this->setState('filter.state', $this->getUserStateFromRequest($this->context . '.filter.state', 'filter_state', '', 'string'));
 		$this->setState('filter.purchase_type', $this->getUserStateFromRequest($this->context . '.filter.purchase_type', 'filter_purchase_type'));
 
 		// Load the parameters.
@@ -185,7 +185,7 @@ protected function getListQuery()
 	 *
 	 * @return  mixed  An array of data items on success, false on failure.
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.6
 	 */
 	public function getItems()
 	{

administrator/components/com_categories/controllers/categories.php

@@ -139,4 +139,25 @@ public function delete()
 
 		$this->setRedirect(JRoute::_('index.php?option=' . $this->option . '&extension=' . $extension, false));
 	}
+
+	/**
+	 * Check in of one or more records.
+	 *
+	 * Overrides JControllerAdmin::checkin to redirect to URL with extension.
+	 *
+	 * @return  boolean  True on success
+	 *
+	 * @since   3.6.0
+	 */
+	public function checkin()
+	{
+		// Process parent checkin method.
+		$result = parent::checkin();
+
+		// Overrride the redirect Uri.
+		$redirectUri = 'index.php?option=' . $this->option . '&view=' . $this->view_list . '&extension=' . $this->input->get('extension', '', 'CMD');
+		$this->setRedirect(JRoute::_($redirectUri, false), $this->message, $this->messageType);
+
+		return $result;
+	}
 }

administrator/components/com_config/model/form/application.xml

@@ -410,29 +410,32 @@
 	<fieldset
 		name="mail"
 		label="CONFIG_MAIL_SETTINGS_LABEL">
+
 		<field
 			name="mailonline"
 			type="radio"
-			class="btn-group btn-group-yesno"
-			default="1"
 			label="COM_CONFIG_FIELD_MAIL_MAILONLINE_LABEL"
 			description="COM_CONFIG_FIELD_MAIL_MAILONLINE_DESC"
-			filter="integer">
+			class="btn-group btn-group-yesno"
+			default="1"
+			filter="integer"
+			>
 			<option value="1">JYES</option>
 			<option value="0">JNO</option>
 		</field>
 
 		<field
-			name="mailer"
-			type="list"
-			default="mail"
-			label="COM_CONFIG_FIELD_MAIL_MAILER_LABEL"
-			description="COM_CONFIG_FIELD_MAIL_MAILER_DESC"
-			filter="word"
-			showon="mailonline:1">
-			<option value="mail">COM_CONFIG_FIELD_VALUE_PHP_MAIL</option>
-			<option value="sendmail">COM_CONFIG_FIELD_VALUE_SENDMAIL</option>
-			<option value="smtp">COM_CONFIG_FIELD_VALUE_SMTP</option>
+			name="massmailoff"
+			type="radio"
+			label="COM_CONFIG_FIELD_MAIL_MASSMAILOFF_LABEL"
+			description="COM_CONFIG_FIELD_MAIL_MASSMAILOFF_DESC"
+			class="btn-group btn-group-yesno"
+			default="0"
+			filter="integer"
+			showon="mailonline:1"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
 		</field>
 
 		<field
@@ -443,7 +446,8 @@
 			filter="string"
 			size="30"
 			validate="email"
-			showon="mailonline:1" />
+			showon="mailonline:1"
+		/>
 
 		<field
 			name="fromname"
@@ -452,61 +456,66 @@
 			description="COM_CONFIG_FIELD_MAIL_FROM_NAME_DESC"
 			filter="string"
 			size="30"
-			showon="mailonline:1" />
+			showon="mailonline:1"
+		/>
 
 		<field
-			name="massmailoff"
-			type="radio"
-			class="btn-group btn-group-yesno"
-			default="0"
-			label="COM_CONFIG_FIELD_MAIL_MASSMAILOFF_LABEL"
-			description="COM_CONFIG_FIELD_MAIL_MASSMAILOFF_DESC"
-			filter="integer"
+			name="mailer"
+			type="list"
+			label="COM_CONFIG_FIELD_MAIL_MAILER_LABEL"
+			description="COM_CONFIG_FIELD_MAIL_MAILER_DESC"
+			default="mail"
+			filter="word"
 			showon="mailonline:1"
 			>
-			<option value="1">JYES</option>
-			<option value="0">JNO</option>
+			<option value="mail">COM_CONFIG_FIELD_VALUE_PHP_MAIL</option>
+			<option value="sendmail">COM_CONFIG_FIELD_VALUE_SENDMAIL</option>
+			<option value="smtp">COM_CONFIG_FIELD_VALUE_SMTP</option>
 		</field>
 
 		<field
 			name="sendmail"
 			type="text"
-			default="/usr/sbin/sendmail"
-			showon="mailonline:1[AND]mailer:sendmail"
 			label="COM_CONFIG_FIELD_MAIL_SENDMAIL_PATH_LABEL"
 			description="COM_CONFIG_FIELD_MAIL_SENDMAIL_PATH_DESC"
+			default="/usr/sbin/sendmail"
+			showon="mailonline:1[AND]mailer:sendmail"
 			filter="string"
-			size="30" />
+			size="30"
+		/>
 
 		<field
 			name="smtphost"
 			type="text"
-			default="localhost"
-			showon="mailonline:1[AND]mailer:smtp"
 			label="COM_CONFIG_FIELD_MAIL_SMTP_HOST_LABEL"
 			description="COM_CONFIG_FIELD_MAIL_SMTP_HOST_DESC"
+			default="localhost"
+			showon="mailonline:1[AND]mailer:smtp"
 			filter="string"
-			size="30" />
+			size="30"
+		/>
 
 		<field
 			name="smtpport"
 			type="text"
-			default="25"
-			showon="mailonline:1[AND]mailer:smtp"
 			label="COM_CONFIG_FIELD_MAIL_SMTP_PORT_LABEL"
 			description="COM_CONFIG_FIELD_MAIL_SMTP_PORT_DESC"
+			default="25"
+			showon="mailonline:1[AND]mailer:smtp"
 			required="true"
 			filter="string"
-			size="6" />
+			size="6"
+		/>
 
 		<field
 			name="smtpsecure"
 			type="list"
-			default="none"
-			showon="mailonline:1[AND]mailer:smtp"
 			label="COM_CONFIG_FIELD_MAIL_SMTP_SECURE_LABEL"
 			description="COM_CONFIG_FIELD_MAIL_SMTP_SECURE_DESC"
-			filter="word">
+			default="none"
+			showon="mailonline:1[AND]mailer:smtp"
+			filter="word"
+			>
 			<option value="none">COM_CONFIG_FIELD_VALUE_NONE</option>
 			<option value="ssl">COM_CONFIG_FIELD_VALUE_SSL</option>
 			<option value="tls">COM_CONFIG_FIELD_VALUE_TLS</option>
@@ -515,35 +524,39 @@
 		<field
 			name="smtpauth"
 			type="radio"
+			label="COM_CONFIG_FIELD_MAIL_SMTP_AUTH_LABEL"
+			description="COM_CONFIG_FIELD_MAIL_SMTP_AUTH_DESC"
 			class="btn-group btn-group-yesno"
 			default="0"
 			showon="mailonline:1[AND]mailer:smtp"
-			label="COM_CONFIG_FIELD_MAIL_SMTP_AUTH_LABEL"
-			description="COM_CONFIG_FIELD_MAIL_SMTP_AUTH_DESC"
-			filter="integer">
+			filter="integer"
+			>
 			<option value="1">JYES</option>
 			<option value="0">JNO</option>
 		</field>
 
 		<field
 			name="smtpuser"
 			type="text"
-			showon="mailonline:1[AND]mailer:smtp[AND]smtpauth:1"
 			label="COM_CONFIG_FIELD_MAIL_SMTP_USERNAME_LABEL"
 			description="COM_CONFIG_FIELD_MAIL_SMTP_USERNAME_DESC"
+			showon="mailonline:1[AND]mailer:smtp[AND]smtpauth:1"
 			filter="string"
 			autocomplete="off"
-			size="30" />
+			size="30"
+		/>
 
 		<field
 			name="smtppass"
 			type="password"
-			showon="mailonline:1[AND]mailer:smtp[AND]smtpauth:1"
 			label="COM_CONFIG_FIELD_MAIL_SMTP_PASSWORD_LABEL"
 			description="COM_CONFIG_FIELD_MAIL_SMTP_PASSWORD_DESC"
+			showon="mailonline:1[AND]mailer:smtp[AND]smtpauth:1"
 			filter="raw"
 			autocomplete="off"
-			size="30" />
+			size="30"
+		/>
+
 	</fieldset>
 
 	<fieldset
@@ -634,7 +647,8 @@
 			default="0"
 			label="COM_CONFIG_FIELD_SEF_REWRITE_LABEL"
 			description="COM_CONFIG_FIELD_SEF_REWRITE_DESC"
-			filter="integer">
+			filter="integer"
+			showon="sef:1">
 			<option value="1">JYES</option>
 			<option value="0">JNO</option>
 		</field>
@@ -646,7 +660,8 @@
 			default="0"
 			label="COM_CONFIG_FIELD_SEF_SUFFIX_LABEL"
 			description="COM_CONFIG_FIELD_SEF_SUFFIX_DESC"
-			filter="integer">
+			filter="integer"
+			showon="sef:1">
 			<option value="1">JYES</option>
 			<option value="0">JNO</option>
 		</field>
@@ -658,7 +673,8 @@
 			default="0"
 			label="COM_CONFIG_FIELD_UNICODESLUGS_LABEL"
 			description="COM_CONFIG_FIELD_UNICODESLUGS_DESC"
-			filter="integer">
+			filter="integer"
+			showon="sef:1">
 			<option value="1">JYES</option>
 			<option value="0">JNO</option>
 		</field>

administrator/components/com_contact/models/contacts.php

@@ -300,13 +300,6 @@ protected function getListQuery()
 			{
 				$query->where('a.id = ' . (int) substr($search, 3));
 			}
-			elseif (stripos($search, 'author:') === 0)
-			{
-				$search = $db->quote('%' . $db->escape(substr($search, 7), true) . '%');
-				$query->where(
-					'(' . $db->quoteName('uc.name') . ' LIKE ' . $search . ' OR ' . $db->quoteName('uc.username') . ' LIKE ' . $search . ')'
-				);
-			}
 			else
 			{
 				$search = $db->quote('%' . str_replace(' ', '%', $db->escape(trim($search), true) . '%'));