Merge branch 'staging' into en-gb-language-package-consis

administrator/components/com_admin/script.php

@@ -235,9 +235,11 @@ protected function updateManifestCaches()
 			array('component', 'com_config', '', 1),
 			array('component', 'com_redirect', '', 1),
 			array('component', 'com_users', '', 1),
+			array('component', 'com_finder', '', 1),
 			array('component', 'com_tags', '', 1),
 			array('component', 'com_contenthistory', '', 1),
 			array('component', 'com_postinstall', '', 1),
+			array('component', 'com_joomlaupdate', '', 1),
 
 			// Libraries
 			array('library', 'phputf8', '', 0),
@@ -1410,14 +1412,14 @@ public function deleteUnexistingFiles()
 			'/administrator/components/com_installer/views/languages/tmpl/default_filter.php',
 			'/administrator/components/com_joomlaupdate/helpers/download.php',
 			// Joomla 3.6.0
-			'libraries/simplepie/README.txt',
-			'libraries/simplepie/simplepie.php',
-			'libraries/simplepie/LICENSE.txt',
-			'libraries/simplepie/idn/LICENCE',
-			'libraries/simplepie/idn/ReadMe.txt',
-			'libraries/simplepie/idn/idna_convert.class.php',
-			'libraries/simplepie/idn/npdata.ser',
-			'administrator/manifests/libraries/simplepie.xml',
+			'/libraries/simplepie/README.txt',
+			'/libraries/simplepie/simplepie.php',
+			'/libraries/simplepie/LICENSE.txt',
+			'/libraries/simplepie/idn/LICENCE',
+			'/libraries/simplepie/idn/ReadMe.txt',
+			'/libraries/simplepie/idn/idna_convert.class.php',
+			'/libraries/simplepie/idn/npdata.ser',
+			'/administrator/manifests/libraries/simplepie.xml',
 		);
 
 		// TODO There is an issue while deleting folders using the ftp mode
@@ -1512,8 +1514,8 @@ public function deleteUnexistingFiles()
 			'/libraries/joomla/document/raw',
 			'/libraries/joomla/document/xml',
 			// Joomla 3.6
-			'libraries/simplepie/idn',
-			'libraries/simplepie',
+			'/libraries/simplepie/idn',
+			'/libraries/simplepie',
 		);
 
 		jimport('joomla.filesystem.file');

administrator/components/com_admin/sql/updates/mysql/3.5.0-2016-03-01.sql

@@ -1,5 +1,12 @@
 ALTER TABLE `#__redirect_links` DROP INDEX `idx_link_old`;
 ALTER TABLE `#__redirect_links` MODIFY `old_url` VARCHAR(2048) NOT NULL;
-ALTER TABLE `#__redirect_links` MODIFY `new_url` VARCHAR(2048) NOT NULL;
+
+--
+-- The following statement had to be modified for 3.6.0 by removing the
+-- NOT NULL, which was wrong because not consistent with new install.
+-- See also 3.6.0-2016-04-06.sql for updating 3.5.0 or 3.5.1
+--
+ALTER TABLE `#__redirect_links` MODIFY `new_url` VARCHAR(2048);
+
 ALTER TABLE `#__redirect_links` MODIFY `referer` VARCHAR(2048) NOT NULL;
 ALTER TABLE `#__redirect_links` ADD INDEX `idx_old_url` (`old_url`(100));

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

@@ -0,0 +1 @@
+ALTER TABLE `#__redirect_links` MODIFY `new_url` VARCHAR(2048);

administrator/components/com_admin/sql/updates/sqlazure/3.5.0-2016-03-01.sql

@@ -1,6 +1,13 @@
 ALTER TABLE [#__redirect_links] DROP CONSTRAINT [#__redirect_links$idx_link_old];
 ALTER TABLE [#__redirect_links] ALTER COLUMN [old_url] [nvarchar](2048) NOT NULL;
-ALTER TABLE [#__redirect_links] ALTER COLUMN [new_url] [nvarchar](2048) NOT NULL;
+
+--
+-- The following statement had to be modified for 3.6.0 by removing the
+-- NOT NULL, which was wrong because not consistent with new install.
+-- See also 3.6.0-2016-04-06.sql for updating 3.5.0 or 3.5.1
+--
+ALTER TABLE [#__redirect_links] ALTER COLUMN [new_url] [nvarchar](2048);
+
 ALTER TABLE [#__redirect_links] ALTER COLUMN [referer] [nvarchar](2048) NOT NULL;
 CREATE NONCLUSTERED INDEX [idx_old_url] ON [#__redirect_links]
 (

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

@@ -0,0 +1 @@
+ALTER TABLE [#__redirect_links] ALTER COLUMN [new_url] [nvarchar](2048);

administrator/components/com_finder/models/fields/contentmap.php

@@ -0,0 +1,111 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_finder
+ *
+ * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+JFormHelper::loadFieldClass('groupedlist');
+
+/**
+ * Form Field class for the Joomla CMS.
+ * Supports a select grouped list of finder content map.
+ *
+ * @since  3.6.0
+ */
+class JFormFieldContentMap extends JFormFieldGroupedList
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var    string
+	 * @since  3.6.0
+	 */
+	public $type = 'ContentMap';
+
+	/**
+	 * Method to get the list of content map options grouped by first level.
+	 *
+	 * @return  array  The field option objects as a nested array in groups.
+	 *
+	 * @since   3.6.0
+	 */
+	protected function getGroups()
+	{
+		$groups = array();
+
+		// Get the database object and a new query object.
+		$db = JFactory::getDbo();
+
+		// Levels subquery.
+		$levelQuery = $db->getQuery(true);
+		$levelQuery->select('title AS branch_title, 1 as level')
+			->select($db->quoteName('id'))
+			->from($db->quoteName('#__finder_taxonomy'))
+			->where($db->quoteName('parent_id') . ' = 1');
+		$levelQuery2 = $db->getQuery(true);
+		$levelQuery2->select('b.title AS branch_title, 2 as level')
+			->select($db->quoteName('a.id'))
+			->from($db->quoteName('#__finder_taxonomy', 'a'))
+			->join('LEFT', $db->quoteName('#__finder_taxonomy', 'b') . ' ON ' . $db->qn('a.parent_id') . ' = ' . $db->qn('b.id'))
+			->where($db->quoteName('a.parent_id') . ' NOT IN (0, 1)');
+
+		$levelQuery->union($levelQuery2);
+
+		// Main query.
+		$query = $db->getQuery(true)
+			->select($db->quoteName('a.title', 'text'))
+			->select($db->quoteName('a.id', 'value'))
+			->select($db->quoteName('d.level'))
+			->from($db->quoteName('#__finder_taxonomy', 'a'))
+			->join('LEFT', '(' . $levelQuery . ') AS d ON ' . $db->qn('d.id') . ' = ' . $db->qn('a.id'))
+			->where($db->quoteName('a.parent_id') . ' <> 0')
+			->order('d.branch_title ASC, d.level ASC, a.title ASC');
+
+		$db->setQuery($query);
+
+		try
+		{
+			$contentMap = $db->loadObjectList();
+		}
+		catch (RuntimeException $e)
+		{
+			return;
+		}
+
+		// Build the grouped list array.
+		if ($contentMap)
+		{
+			foreach ($contentMap as $branch)
+			{
+				if ((int) $branch->level === 1)
+				{
+					$name = $branch->text;
+				}
+				else
+				{
+					$levelPrefix = str_repeat('- ', max(0, $branch->level - 1));
+
+					$text = $branch->text == '*' ? 'JALL_LANGUAGE' : $branch->text;
+
+					// Initialize the group if necessary.
+					if (!isset($groups[$name]))
+					{
+						$groups[$name] = array();
+					}
+
+					$groups[$name][] = JHtml::_('select.option', $branch->value, $levelPrefix . JText::_($text));
+				}
+			}
+		}
+
+		// Merge any additional groups in the XML definition.
+		$groups = array_merge(parent::getGroups(), $groups);
+
+		return $groups;
+	}
+}

administrator/components/com_finder/models/forms/filter_index.xml

@@ -27,6 +27,15 @@
 			>
 			<option value="">COM_FINDER_MAPS_SELECT_TYPE</option>
 		</field>
+		<field
+			name="content_map"
+			type="ContentMap"
+			label="COM_FINDER_FILTER_CONTENT_MAP_LABEL"
+			description="COM_FINDER_FILTER_CONTENT_MAP_DESC"
+			onchange="this.form.submit();"
+			>
+			<option value="">COM_FINDER_FILTER_SELECT_CONTENT_MAP</option>
+		</field>
 	</fields>
 	<fields name="list">
 		<field

administrator/components/com_finder/models/index.php

@@ -51,6 +51,7 @@ public function __construct($config = array())
 				't.title', 't_title',
 				'url', 'l.url',
 				'indexdate', 'l.indexdate',
+				'content_map',
 			);
 		}
 
@@ -190,6 +191,15 @@ protected function getListQuery()
 			$query->where($db->quoteName('l.type_id') . ' = ' . (int) $type);
 		}
 
+		// Check the map filter.
+		$contentMapId = $this->getState('filter.content_map');
+
+		if (is_numeric($contentMapId))
+		{
+			$query->join('INNER', $db->quoteName('#__finder_taxonomy_map', 'm') . ' ON ' . $db->quoteName('m.link_id') . ' = ' . $db->quoteName('l.link_id'))
+				->where($db->quoteName('m.node_id') . ' = ' . (int) $contentMapId);
+		}
+
 		// Check for state filter.
 		$state = $this->getState('filter.state');
 
@@ -275,6 +285,7 @@ protected function getStoreId($id = '')
 		$id .= ':' . $this->getState('filter.search');
 		$id .= ':' . $this->getState('filter.state');
 		$id .= ':' . $this->getState('filter.type');
+		$id .= ':' . $this->getState('filter.content_map');
 
 		return parent::getStoreId($id);
 	}
@@ -377,6 +388,7 @@ protected function populateState($ordering = 'l.title', $direction = 'asc')
 		$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', '', 'cmd'));
 		$this->setState('filter.type', $this->getUserStateFromRequest($this->context . '.filter.type', 'filter_type', '', 'cmd'));
+		$this->setState('filter.content_map', $this->getUserStateFromRequest($this->context . '.filter.content_map', 'filter_content_map', '', 'cmd'));
 
 		// Load the parameters.
 		$params = JComponentHelper::getParams('com_finder');

administrator/components/com_finder/views/index/tmpl/default.php

@@ -93,7 +93,7 @@
 			</thead>
 			<tfoot>
 				<tr>
-					<td colspan="6">
+					<td colspan="7">
 						<?php echo $this->pagination->getListFooter(); ?>
 					</td>
 				</tr>

administrator/components/com_menus/models/items.php

@@ -194,7 +194,7 @@ protected function getListQuery()
 					),
 					array(
 						null, null, null, null, null, null, null, null, null,
-						null, 'apublished', null, null, null, null,
+						null, 'a.published', null, null, null, null,
 						null, null, null, null, null, null, null, null, null
 					)
 				)

administrator/components/com_menus/views/items/tmpl/default_batch_body.php

@@ -13,8 +13,9 @@
 	JHtml::_('select.option', 'm', JText::_('JLIB_HTML_BATCH_MOVE'))
 );
 $published = $this->state->get('filter.published');
+$menuType = JFactory::getApplication()->getUserState('com_menus.items.menutype');
 ?>
-
+<?php if (strlen($menuType) && $menuType != '*') : ?>
 <div class="row-fluid">
 	<div class="control-group span6">
 		<div class="controls">
@@ -45,4 +46,9 @@
 			<?php echo JHtml::_('select.radiolist', $options, 'batch[move_copy]', '', 'value', 'text', 'm'); ?>
 		</div>
 	<?php endif; ?>
-</div>
+</div>
+<?php else : ?>
+<div class="row-fluid">
+	<p><?php echo JText::_('COM_MENUS_SELECT_MENU_FIRST') ?></p>
+</div>
+<?php endif; ?>

administrator/components/com_menus/views/items/tmpl/default_batch_footer.php

@@ -8,12 +8,12 @@
  */
 defined('_JEXEC') or die;
 
-$menuType = (array) JFactory::getApplication()->getUserState('com_menus.items.menutype');
+$menuType = JFactory::getApplication()->getUserState('com_menus.items.menutype');
 ?>
 <button class="btn" type="button" onclick="document.getElementById('batch-menu-id').value='';document.getElementById('batch-access').value='';document.getElementById('batch-language-id').value=''" data-dismiss="modal">
 	<?php echo JText::_('JCANCEL'); ?>
 </button>
-<?php if (!empty($menuType)) : ?>
+<?php if (strlen($menuType) && $menuType != '*') : ?>
 	<button class="btn btn-success" type="submit" onclick="Joomla.submitbutton('item.batch');">
 		<?php echo JText::_('JGLOBAL_BATCH_PROCESS'); ?>
 	</button>

administrator/components/com_modules/views/modules/tmpl/default.php

@@ -147,7 +147,7 @@
 									<?php echo JHtml::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'modules.', $canCheckin); ?>
 								<?php endif; ?>
 								<?php if ($canEdit) : ?>
-									<a href="<?php echo JRoute::_('index.php?option=com_modules&task=module.edit&id=' . (int) $item->id); ?>">
+									<a class="hasTooltip" href="<?php echo JRoute::_('index.php?option=com_modules&task=module.edit&id=' . (int) $item->id); ?>" title="<?php echo JText::_('JACTION_EDIT'); ?>">
 										<?php echo $this->escape($item->title); ?></a>
 								<?php else : ?>
 									<?php echo $this->escape($item->title); ?>

administrator/components/com_redirect/models/forms/filter_links.xml

@@ -40,6 +40,8 @@
 			<option value="a.created_date DESC">COM_REDIRECT_HEADING_CREATED_DATE_DESC</option>
 			<option value="a.hits ASC">COM_REDIRECT_HEADING_HITS_ASC</option>
 			<option value="a.hits DESC">COM_REDIRECT_HEADING_HITS_DESC</option>
+			<option value="a.header ASC">COM_REDIRECT_HEADING_STATUS_CODE_ASC</option>
+			<option value="a.header DESC">COM_REDIRECT_HEADING_STATUS_CODE_DESC</option>
 			<option value="a.id ASC">JGRID_HEADING_ID_ASC</option>
 			<option value="a.id DESC">JGRID_HEADING_ID_DESC</option>
 		</field>

administrator/components/com_redirect/models/links.php

@@ -36,6 +36,7 @@ public function __construct($config = array())
 				'hits', 'a.hits',
 				'created_date', 'a.created_date',
 				'published', 'a.published',
+				'header', 'a.header',
 			);
 		}
 
@@ -149,7 +150,7 @@ protected function getListQuery()
 		}
 		elseif ($state === '')
 		{
-			$query->where($db->quoteName('a.published') . ' IN (0,1,2)');
+			$query->where($db->quoteName('a.published') . ' IN (0,1)');
 		}
 
 		// Filter the items over the search string if set.

administrator/components/com_redirect/views/links/tmpl/default.php

@@ -53,14 +53,17 @@
 						<th width="1%" class="nowrap hidden-phone">
 							<?php echo JHtml::_('searchtools.sort', 'COM_REDIRECT_HEADING_HITS', 'a.hits', $listDirn, $listOrder); ?>
 						</th>
+						<th width="1%" class="nowrap hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'COM_REDIRECT_HEADING_STATUS_CODE', 'a.header', $listDirn, $listOrder); ?>
+						</th>
 						<th width="1%" class="nowrap hidden-phone">
 							<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_ID', 'a.id', $listDirn, $listOrder); ?>
 						</th>
 					</tr>
 				</thead>
 				<tfoot>
 					<tr>
-						<td colspan="8">
+						<td colspan="9">
 							<?php echo $this->pagination->getListFooter(); ?>
 						</td>
 					</tr>
@@ -107,6 +110,9 @@
 						<td class="hidden-phone">
 							<?php echo (int) $item->hits; ?>
 						</td>
+						<td class="hidden-phone">
+							<?php echo (int) $item->header; ?>
+						</td>
 						<td class="hidden-phone">
 							<?php echo (int) $item->id; ?>
 						</td>

administrator/language/en-GB/en-GB.com_banners.ini

@@ -242,4 +242,4 @@ COM_BANNERS_TYPE1="Impressions"
 COM_BANNERS_TYPE2="Clicks"
 COM_BANNERS_UNLIMITED="Unlimited"
 COM_BANNERS_XML_DESCRIPTION="This component manages banners and banner clients."
-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."
+JLIB_RULES_SETTING_NOTES="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."

administrator/language/en-GB/en-GB.com_cache.ini

@@ -36,4 +36,4 @@ COM_CACHE_RESOURCE_INTENSIVE_WARNING="This can be resource intensive on sites wi
 COM_CACHE_SIZE="Size"
 COM_CACHE_SELECT_CLIENT="- Select Location -"
 COM_CACHE_XML_DESCRIPTION="Component for cache management."
-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."
+JLIB_RULES_SETTING_NOTES="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."

administrator/language/en-GB/en-GB.com_categories.ini

@@ -83,4 +83,4 @@ COM_CATEGORY_COUNT_UNPUBLISHED_ITEMS="Unpublished items"
 COM_CATEGORY_HEADING_ASSOCIATION="Association"
 JGLOBAL_NO_ITEM_SELECTED="No categories selected."
 JLIB_HTML_ACCESS_SUMMARY_DESC="Shown below is an overview of the permission settings for this category. Select the tabs above to customise these settings by action."
-JLIB_RULES_SETTING_NOTES_ITEM="1. Changes apply to this category and all child categories.<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."
+JLIB_RULES_SETTING_NOTES_ITEM="Changes apply to this category and all child categories.<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."

administrator/language/en-GB/en-GB.com_checkin.ini

@@ -20,4 +20,4 @@ COM_CHECKIN_N_ITEMS_CHECKED_IN_MORE="%s items checked in."
 COM_CHECKIN_NO_ITEMS="There are no tables with checked out items or there are no tables with checked out items that match your search."
 COM_CHECKIN_TABLE="<em>%s</em> table"
 COM_CHECKIN_XML_DESCRIPTION="Check-in Component."
-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."
+JLIB_RULES_SETTING_NOTES="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."