Merge branch '3.7.x' of https://github.com/joomla/joomla-cms into sef…

…_no_IDs

.drone.yml

@@ -1,5 +1,5 @@
 build:
-  image: yveshoppe/joomla-systemtests:latest
+  image: joomlaprojects/docker-systemtests:latest
   commands:
     - apt-get install nodejs npm
     - ln -s /usr/bin/nodejs /usr/bin/node

administrator/components/com_menus/views/items/view.html.php

@@ -328,6 +328,12 @@ protected function addToolbar()
 			JToolbarHelper::trash('items.trash');
 		}
 
+		if ($canDo->get('core.admin') || $canDo->get('core.options'))
+		{
+			JToolbarHelper::divider();
+			JToolbarHelper::preferences('com_menus');
+		}
+
 		JToolbarHelper::help('JHELP_MENUS_MENU_ITEM_MANAGER');
 	}
 

administrator/components/com_users/models/forms/note.xml

@@ -28,7 +28,10 @@
 			extension="com_users"
 			required="true"
 			label="COM_USERS_FIELD_CATEGORY_ID_LABEL"
-			description="JFIELD_CATEGORY_DESC" 
+			description="JFIELD_CATEGORY_DESC"
+			required="true"
+			select="true"
+			new="true"
 			edit="true"
 			clear="true"
 		>

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

@@ -424,7 +424,7 @@ JGLOBAL_MENU_SELECTION="Menu Selection:"
 JGLOBAL_MODIFIED="Modified"
 JGLOBAL_MODIFIED_DATE="Modified Date"
 JGLOBAL_MOST_HITS="Most Hits"
-JGLOBAL_MOST_RECENT_FIRST="Most recent first"
+JGLOBAL_MOST_RECENT_FIRST="Most Recent First"
 JGLOBAL_MULTI_COLUMN_ORDER_DESC="Order articles down or across columns."
 JGLOBAL_MULTI_COLUMN_ORDER_LABEL="Multi Column Order"
 JGLOBAL_MULTI_LEVEL="Multi Level"
@@ -447,7 +447,7 @@ JGLOBAL_NUMBER_CATEGORY_ITEMS_LABEL="Show Article Count"
 JGLOBAL_NUMBER_ITEMS_LIST_DESC="Default number of articles to list on a page."
 JGLOBAL_NUMBER_ITEMS_LIST_LABEL="# Articles to List"
 JGLOBAL_NO_MATCHING_RESULTS="No Matching Results"
-JGLOBAL_OLDEST_FIRST="Oldest first"
+JGLOBAL_OLDEST_FIRST="Oldest First"
 JGLOBAL_ORDER_ASCENDING="Ascending"
 JGLOBAL_ORDER_DESCENDING="Descending"
 JGLOBAL_ORDER_DIRECTION_LABEL="Direction"

administrator/templates/isis/html/layouts/joomla/pagination/link.php

@@ -0,0 +1,106 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+/** @var JPaginationObject $item */
+$item = $displayData['data'];
+
+if (!empty($displayData['pagOptions']))
+{
+	$options = new Joomla\Registry\Registry($displayData['pagOptions']);
+	$liClass = $options->get('liClass', '');
+	$addText = $options->get('addText', '');
+}
+else
+{
+	$liClass = $addText = '';
+}
+
+$display = $item->text;
+
+switch ((string) $item->text)
+{
+	// Check for "Start" item
+	case JText::_('JLIB_HTML_START') :
+		$icon = "icon-backward icon-first";
+		break;
+
+	// Check for "Prev" item
+	case JText::_('JPREV') :
+		$item->text = JText::_('JPREVIOUS');
+		$icon = "icon-step-backward icon-previous";
+		break;
+
+	// Check for "Next" item
+	case JText::_('JNEXT') :
+		$icon = "icon-step-forward icon-next";
+		break;
+
+	// Check for "End" item
+	case JText::_('JLIB_HTML_END') :
+		$icon = "icon-forward icon-last";
+		break;
+
+	default:
+		$icon = null;
+		break;
+}
+
+$item->text .= $addText ? $addText : '';
+
+if ($icon !== null)
+{
+	$display = '<span class="' . $icon . '"></span>';
+}
+
+if ($displayData['active'])
+{
+	if ($item->base > 0)
+	{
+		$limit = 'limitstart.value=' . $item->base;
+	}
+	else
+	{
+		$limit = 'limitstart.value=0';
+	}
+
+	$cssClasses = array();
+
+	$title = '';
+
+	if (!is_numeric($item->text))
+	{
+		JHtml::_('bootstrap.tooltip');
+		$cssClasses[] = 'hasTooltip';
+		$title = ' title="' . $item->text . '" ';
+	}
+
+	$onClick = 'document.adminForm.' . $item->prefix . 'limitstart.value=' . ($item->base > 0 ? $item->base : '0') . '; Joomla.submitform();return false;';
+}
+else
+{
+	$class = (property_exists($item, 'active') && $item->active) ? 'active' : 'disabled';
+	if ($class != 'active')
+	{
+		$class .= $liClass ? ($class ? ' ' : '') . $liClass : '';
+	}
+}
+?>
+<?php if ($displayData['active']) : ?>
+	<li<?php echo $liClass ? ' class="' . $liClass . '"' : ''; ?>>
+		<a class="<?php echo implode(' ', $cssClasses); ?>" <?php echo $title; ?> href="#" onclick="<?php echo $onClick; ?>">
+			<?php echo $display; ?>
+		</a>
+	</li>
+<?php else : ?>
+	<li class="<?php echo $class; ?>">
+		<span><?php echo $display; ?></span>
+	</li>
+<?php endif;

administrator/templates/isis/html/layouts/joomla/pagination/links.php

@@ -0,0 +1,55 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+use Joomla\Registry\Registry;
+
+$list = $displayData['list'];
+$pages = $list['pages'];
+$pagesTotal = $list['pagesTotal'];
+
+$options = new Registry($displayData['options']);
+
+$showLimitBox   = $options->get('showLimitBox', 0);
+$showPagesLinks = $options->get('showPagesLinks', true);
+$showLimitStart = $options->get('showLimitStart', true);
+?>
+
+<div class="pagination pagination-toolbar clearfix">
+
+	<?php if ($showLimitBox) : ?>
+		<div class="limit pull-right">
+			<?php echo $list['limitfield']; ?>
+		</div>
+	<?php endif; ?>
+
+	<?php if ($showPagesLinks && (!empty($pages))) : ?>
+		<ul class="pagination-list">
+			<?php
+				$pages['start']['pagOptions'] = array('addText' => ' (' . JText::sprintf('JLIB_HTML_PAGE_CURRENT_OF_TOTAL', 1, $pagesTotal) . ')');
+				echo JLayoutHelper::render('joomla.pagination.link', $pages['start']);
+				echo JLayoutHelper::render('joomla.pagination.link', $pages['previous']); ?>
+			<?php foreach ($pages['pages'] as $page) :
+				$page['pagOptions'] = array('liClass' => 'hidden-phone');
+			?>
+				<?php echo JLayoutHelper::render('joomla.pagination.link', $page); ?>
+			<?php endforeach; ?>
+			<?php
+				echo JLayoutHelper::render('joomla.pagination.link', $pages['next']);
+				$pages['end']['pagOptions'] = array('addText' => ' (' . JText::sprintf('JLIB_HTML_PAGE_CURRENT_OF_TOTAL', $pagesTotal, $pagesTotal) . ')');
+				echo JLayoutHelper::render('joomla.pagination.link', $pages['end']); ?>
+		</ul>
+	<?php endif; ?>
+
+	<?php if ($showLimitStart) : ?>
+		<input type="hidden" name="<?php echo $list['prefix']; ?>limitstart" value="<?php echo $list['limitstart']; ?>" />
+	<?php endif; ?>
+
+</div>

administrator/templates/isis/html/pagination.php

@@ -59,24 +59,6 @@
  * NOTE: If you override pagination_item_active OR pagination_item_inactive you MUST override them both
  */
 
-/**
- * Renders the pagination footer
- *
- * @param   array  $list  Array containing pagination footer
- *
- * @return  string  HTML markup for the full pagination footer
- *
- * @since   3.0
- */
-function pagination_list_footer($list)
-{
-	$html = "<div class=\"pagination pagination-toolbar\">\n";
-	$html .= $list['pageslinks'];
-	$html .= "\n<input type=\"hidden\" name=\"" . $list['prefix'] . "limitstart\" value=\"" . $list['limitstart'] . "\" />";
-	$html .= "\n</div>";
-
-	return $html;
-}
 
 /**
  * Renders the pagination list

components/com_banners/models/banners.php

@@ -64,6 +64,7 @@ protected function getListQuery()
 		$keywords   = $this->getState('filter.keywords');
 		$randomise  = ($ordering == 'random');
 		$nullDate   = $db->quote($db->getNullDate());
+		$nowDate    = $db->quote(JFactory::getDate()->toSql());
 
 		$query->select(
 			'a.id as id,'
@@ -80,8 +81,8 @@ protected function getListQuery()
 			->from('#__banners as a')
 			->join('LEFT', '#__banner_clients AS cl ON cl.id = a.cid')
 			->where('a.state=1')
-			->where('(' . $query->currentTimestamp() . ' >= a.publish_up OR a.publish_up = ' . $nullDate . ')')
-			->where('(' . $query->currentTimestamp() . ' <= a.publish_down OR a.publish_down = ' . $nullDate . ')')
+			->where('(a.publish_up = ' . $nullDate . ' OR a.publish_up <= ' . $nowDate . ')')
+			->where('(a.publish_down = ' . $nullDate . ' OR a.publish_down >= ' . $nowDate . ')')
 			->where('(a.imptotal = 0 OR a.impmade <= a.imptotal)');
 
 		if ($cid)

components/com_contact/views/category/tmpl/default.xml

@@ -23,8 +23,10 @@
 				description="COM_CONTACT_FIELD_CATEGORY_DESC"
 				extension="com_contact"
 				required="true"
+				select="true"
+				new="true"
 				edit="true"
-				clear="false"
+				clear="true"
 			/>
 		</fieldset>
 	</fields>

components/com_content/views/category/tmpl/blog.xml

@@ -19,8 +19,10 @@
 				description="JGLOBAL_CHOOSE_CATEGORY_DESC"
 				extension="com_content"
 				required="true"
+				select="true"
+				new="true"
 				edit="true"
-				clear="false"
+				clear="true"
 			/>
 		</fieldset>
 	</fields>
@@ -625,4 +627,4 @@
 			</field>
 		</fieldset>
 	</fields>
-</metadata>
+</metadata>

components/com_content/views/category/tmpl/default.xml

@@ -21,8 +21,10 @@
 				description="JGLOBAL_CHOOSE_CATEGORY_DESC"
 				extension="com_content"
 				required="true"
+				select="true"
+				new="true"
 				edit="true"
-				clear="false"
+				clear="true"
 			/>
 		</fieldset>
 	</fields>

components/com_modules/modules.php

@@ -10,11 +10,18 @@
 defined('_JEXEC') or die;
 
 // Load the required admin language files
-$lang = JFactory::getLanguage();
+$lang   = JFactory::getLanguage();
+$app    = JFactory::getApplication();
+$config = array();
 $lang->load('joomla', JPATH_ADMINISTRATOR);
 $lang->load('com_modules', JPATH_ADMINISTRATOR);
 
+if ($app->input->get('task') === 'module.orderPosition')
+{
+	$config['base_path'] = JPATH_COMPONENT_ADMINISTRATOR;
+}
+
 // Trigger the controller
-$controller = JControllerLegacy::getInstance('Modules');
-$controller->execute(JFactory::getApplication()->input->get('task'));
+$controller = JControllerLegacy::getInstance('Modules', $config);
+$controller->execute($app->input->get('task'));
 $controller->redirect();

components/com_newsfeeds/views/category/tmpl/default.xml

@@ -23,8 +23,10 @@
 				description="COM_NEWSFEEDS_FIELD_SELECT_CATEGORY_DESC"
 				extension="com_newsfeeds"
 				required="true"
+				select="true"
+				new="true"
 				edit="true"
-				clear="false"
+				clear="true"
 			/>
 		</fieldset>
 	</fields>

libraries/cms/component/router/rules/menu.php

@@ -55,7 +55,13 @@ public function __construct(JComponentRouterView $router)
 	 */
 	public function preprocess(&$query)
 	{
-		if (isset($query['Itemid']) && $this->router->menu->getActive() && $query['Itemid'] != $this->router->menu->getActive()->id)
+		/**
+		 * If the active item id is not the same as the supplied item id or we have a supplied item id and no active
+		 * menu item then we just use the supplied menu item and continue
+		 */
+		if (isset($query['Itemid'])
+			&& (($this->router->menu->getActive() && $query['Itemid'] != $this->router->menu->getActive()->id)
+			|| ($this->router->menu->getActive() === null)))
 		{
 			return;
 		}

libraries/cms/component/router/rules/standard.php

@@ -62,7 +62,11 @@ public function parse(&$segments, &$vars)
 		// Get the views and the currently active query vars
 		$views = $this->router->getViews();
 		$active = $this->router->menu->getActive();
-		$vars = array_merge($active->query, $vars);
+
+		if ($active)
+		{
+			$vars = array_merge($active->query, $vars);
+		}
 
 		// We don't have a view or its not a view of this component! We stop here
 		if (!isset($vars['view']) || !isset($views[$vars['view']]))

libraries/cms/pagination/pagination.php

@@ -461,6 +461,7 @@ public function getPaginationLinks($layoutId = 'joomla.pagination.links', $optio
 			'limitfield'   => $this->getLimitBox(),
 			'pagescounter' => $this->getPagesCounter(),
 			'pages'        => $this->getPaginationPages(),
+			'pagesTotal'   => $this->pagesTotal,
 		);
 
 		return JLayoutHelper::render($layoutId, array('list' => $list, 'options' => $options));

libraries/joomla/document/renderer/html/head.php

@@ -137,7 +137,7 @@ public function fetchHead($document)
 		// Generate stylesheet links
 		foreach ($document->_styleSheets as $strSrc => $strAttr)
 		{
-			$buffer .= $tab . '<link rel="stylesheet" href="' . $strSrc . '"';
+			$buffer .= $tab . '<link href="' . $strSrc . '" rel="stylesheet"';
 
 			if (!is_null($strAttr['mime']) && (!$document->isHtml5() || !in_array($strAttr['mime'], $defaultCssMimes)))
 			{

libraries/joomla/form/fields/checkbox.php

@@ -96,6 +96,16 @@ public function __set($name, $value)
 	 */
 	public function setup(SimpleXMLElement $element, $value, $group = null)
 	{
+		// Handle the default attribute
+		$default = (string) $element['default'];
+
+		if ($default)
+		{
+			$test = $this->form->getValue((string) $element['name'], $group);
+
+			$value = ($test == $default) ? $default : null;
+		}
+
 		$return = parent::setup($element, $value, $group);
 
 		if ($return)