Merge branch 'staging' into unique-dispatcher

administrator/components/com_admin/models/forms/profile.xml

@@ -1,46 +1,56 @@
 <?xml version="1.0" encoding="utf-8"?>
 <form>
 	<fieldset name="user_details">
-		<field name="name" type="text"
-			description="COM_ADMIN_USER_FIELD_NAME_DESC"
+		<field 
+			name="name" 
+			type="text"
 			label="COM_ADMIN_USER_HEADING_NAME"
+			description="COM_ADMIN_USER_FIELD_NAME_DESC"
 			required="true"
 			size="30"
 		/>
 
-		<field name="username" type="text"
-			description="COM_ADMIN_USER_FIELD_USERNAME_DESC"
+		<field 
+			name="username" 
+			type="text"
 			label="COM_ADMIN_USER_FIELD_USERNAME_LABEL"
+			description="COM_ADMIN_USER_FIELD_USERNAME_DESC"
 			required="true"
 			size="30"
 		/>
 
-		<field name="password2" type="password"
+		<field 
+			name="password2" 
+			type="password"
+			label="JGLOBAL_PASSWORD"
+			description="COM_ADMIN_USER_FIELD_PASSWORD_DESC"
 			autocomplete="off"
 			class="validate-password"
-			description="COM_ADMIN_USER_FIELD_PASSWORD_DESC"
 			field="password"
 			filter="raw"
-			label="JGLOBAL_PASSWORD"
 			message="COM_ADMIN_USER_FIELD_PASSWORD1_MESSAGE"
 			size="30"
 			validate="equals"
 		/>
 
-		<field name="password" type="password"
+		<field 
+			name="password" 
+			type="password"
+			label="COM_ADMIN_USER_FIELD_PASSWORD2_LABEL"
+			description="COM_ADMIN_USER_FIELD_PASSWORD2_DESC"
 			autocomplete="off"
 			class="validate-password"
-			description="COM_ADMIN_USER_FIELD_PASSWORD2_DESC"
 			filter="raw"
-			label="COM_ADMIN_USER_FIELD_PASSWORD2_LABEL"
 			size="30"
 			validate="password"
 		/>
 
-		<field name="email" type="email"
-			class="validate-email"
-			description="COM_ADMIN_USER_FIELD_EMAIL_DESC"
+		<field 
+			name="email" 
+			type="email"
 			label="JGLOBAL_EMAIL"
+			description="COM_ADMIN_USER_FIELD_EMAIL_DESC"
+			class="validate-email"
 			required="true"
 			size="30"
 			validate="email"
@@ -49,9 +59,9 @@
 		<field
 			name="registerDate"
 			type="calendar"
-			class="readonly"
 			label="COM_ADMIN_USER_FIELD_REGISTERDATE_LABEL"
 			description="COM_ADMIN_USER_FIELD_REGISTERDATE_DESC"
+			class="readonly"
 			readonly="true"
 			translateformat="true"
 			showtime="true"
@@ -62,9 +72,9 @@
 		<field
 			name="lastvisitDate"
 			type="calendar"
-			class="readonly"
 			label="COM_ADMIN_USER_FIELD_LASTVISIT_LABEL"
 			description="COM_ADMIN_USER_FIELD_LASTVISIT_DESC"
+			class="readonly"
 			readonly="true"
 			translateformat="true"
 			showtime="true"
@@ -75,13 +85,13 @@
 		<field
 			name="id"
 			type="text"
-			class="readonly"
 			label="JGLOBAL_FIELD_ID_LABEL"
-			description ="JGLOBAL_FIELD_ID_DESC"
+			description="JGLOBAL_FIELD_ID_DESC"
+			class="readonly"
 			default="0"
 			readonly="true"
 			filter="unset"
-			/>
+		/>
 
 	</fieldset>
 
@@ -90,48 +100,61 @@
 		<!--  Basic user account settings. -->
 		<fieldset name="settings" label="COM_ADMIN_USER_SETTINGS_FIELDSET_LABEL">
 
-			<field name="admin_style" type="templatestyle"
-				client="administrator"
-				description="COM_ADMIN_USER_FIELD_BACKEND_TEMPLATE_DESC"
+			<field 
+				name="admin_style" 
+				type="templatestyle"
 				label="COM_ADMIN_USER_FIELD_BACKEND_TEMPLATE_LABEL"
-			>
+				description="COM_ADMIN_USER_FIELD_BACKEND_TEMPLATE_DESC"
+				client="administrator"
+				>
 				<option value="">JOPTION_USE_DEFAULT</option>
 			</field>
 
-			<field name="admin_language" type="language"
-				client="administrator"
-				description="COM_ADMIN_USER_FIELD_BACKEND_LANGUAGE_DESC"
+			<field 
+				name="admin_language" 
+				type="language"
 				label="COM_ADMIN_USER_FIELD_BACKEND_LANGUAGE_LABEL"
-			>
+				description="COM_ADMIN_USER_FIELD_BACKEND_LANGUAGE_DESC"
+				client="administrator"
+				>
 				<option value="">JOPTION_USE_DEFAULT</option>
 			</field>
 
-			<field name="language" type="language"
-				client="site"
-				description="COM_ADMIN_USER_FIELD_FRONTEND_LANGUAGE_DESC"
+			<field 
+				name="language"
+				type="language"
 				label="COM_ADMIN_USER_FIELD_FRONTEND_LANGUAGE_LABEL"
-			>
+				description="COM_ADMIN_USER_FIELD_FRONTEND_LANGUAGE_DESC"
+				client="site"
+				>
 				<option value="">JOPTION_USE_DEFAULT</option>
 			</field>
 
-			<field name="editor" type="plugins" folder="editors"
-				description="COM_ADMIN_USER_FIELD_EDITOR_DESC"
+			<field 
+				name="editor" 
+				type="plugins" 
 				label="COM_ADMIN_USER_FIELD_EDITOR_LABEL"
-			>
+				description="COM_ADMIN_USER_FIELD_EDITOR_DESC"
+				folder="editors"
+				>
 				<option value="">JOPTION_USE_DEFAULT</option>
 			</field>
 
-			<field name="helpsite" type="helpsite"
+			<field 
+				name="helpsite" 
+				type="helpsite"
 				label="COM_ADMIN_USER_FIELD_HELPSITE_LABEL"
 				description="COM_ADMIN_USER_FIELD_HELPSITE_DESC"
-			>
+				>
 				<option value="">JOPTION_USE_DEFAULT</option>
 			</field>
 
-			<field name="timezone" type="timezone"
+			<field 
+				name="timezone" 
+				type="timezone"
 				label="COM_ADMIN_USER_FIELD_TIMEZONE_LABEL"
 				description="COM_ADMIN_USER_FIELD_TIMEZONE_DESC"
-			>
+				>
 				<option value="">JOPTION_USE_DEFAULT</option>
 			</field>
 		</fieldset>

administrator/components/com_admin/sql/updates/mysql/3.7.3-2017-06-03.sql

@@ -0,0 +1 @@
+ALTER TABLE `#__menu` MODIFY `checked_out_time` datetime NOT NULL DEFAULT '0000-00-00 00:00:00' COMMENT 'The time the menu item was checked out.';

administrator/components/com_associations/models/forms/association.xml

@@ -6,7 +6,7 @@
 			type="itemlanguage"
 			label="COM_ASSOCIATIONS_ITEM_FIELD_LANGUAGE_LABEL"
 			description="COM_ASSOCIATIONS_ITEM_FIELD_LANGUAGE_DESC"
-		>
+			>
 			<option value="">COM_ASSOCIATIONS_SELECT_TARGET_LANGUAGE</option>
 		</field>
 

administrator/components/com_associations/models/forms/filter_associations.xml

@@ -7,18 +7,18 @@
 		description="COM_ASSOCIATIONS_COMPONENT_SELECTOR_DESC"
 		filtermode="selector"
 		onchange="jQuery('select[id^=\'filter_\']').val('');jQuery('select[id^=\'list_\']').val('');this.form.submit();"
-	>
+		>
 		<option value="">COM_ASSOCIATIONS_FILTER_SELECT_ITEM_TYPE</option>
 	</field>
 
 	<field
 		name="language"
 		type="contentlanguage"
 		label="JOPTION_FILTER_LANGUAGE"
-		filtermode="selector"
 		description="JOPTION_FILTER_LANGUAGE_DESC"
+		filtermode="selector"
 		onchange="this.form.submit();"
-	>
+		>
 		<option value="">JOPTION_SELECT_LANGUAGE</option>
 	</field>
 
@@ -37,7 +37,7 @@
 			label="JOPTION_FILTER_PUBLISHED"
 			description="JOPTION_FILTER_PUBLISHED_DESC"
 			onchange="this.form.submit();"
-		>
+			>
 			<option value="">JOPTION_SELECT_PUBLISHED</option>
 		</field>
 
@@ -49,7 +49,7 @@
 			published="0,1,2"
 			extension="dynamic"
 			onchange="this.form.submit();"
-		>
+			>
 			<option value="">JOPTION_SELECT_CATEGORY</option>
 		</field>
 
@@ -60,7 +60,7 @@
 			description="COM_ASSOCIATIONS_FILTER_MENUTYPE_DESC"
 			clientid="0"
 			onchange="this.form.submit();"
-		>
+			>
 			<option value="">COM_ASSOCIATIONS_SELECT_MENU</option>
 		</field>
 
@@ -70,7 +70,7 @@
 			label="JOPTION_FILTER_ACCESS"
 			description="JOPTION_FILTER_ACCESS_DESC"
 			onchange="this.form.submit();"
-		>
+			>
 			<option value="">JOPTION_SELECT_ACCESS</option>
 		</field>
 
@@ -83,7 +83,7 @@
 			last="10"
 			step="1"
 			onchange="this.form.submit();"
-		>
+			>
 			<option value="">JOPTION_SELECT_MAX_LEVELS</option>
 		</field>
 	</fields>
@@ -94,7 +94,7 @@
 			type="list"
 			default="id ASC"
 			onchange="this.form.submit();"
-		>
+			>
 			<option value="">JGLOBAL_SORT_BY</option>
 			<option value="state ASC">JSTATUS_ASC</option>
 			<option value="state DESC">JSTATUS_DESC</option>

administrator/components/com_associations/views/associations/tmpl/default.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+	<layout title="COM_ASSOCIATIONS">
+		<message>
+			<![CDATA[COM_ASSOCIATIONS_XML_DESCRIPTION]]>
+		</message>
+	</layout>
+</metadata>

administrator/components/com_associations/views/associations/tmpl/modal.php

@@ -111,7 +111,7 @@
 				<tr class="row<?php echo $i % 2; ?>">
 					<?php if (!empty($this->typeSupports['state'])) : ?>
 						<td class="center">
-							<span class="<?php echo $iconStates[$this->escape($item->state)]; ?>"></span>
+							<span class="<?php echo $iconStates[$this->escape($item->state)]; ?>" aria-hidden="true"></span>
 						</td>
 					<?php endif; ?>
 					<td class="nowrap has-context">

administrator/components/com_banners/models/forms/download.xml

@@ -18,8 +18,8 @@
 		<field
 			name="basename"
 			type="text"
-			size="40"
 			label="COM_BANNERS_FIELD_BASENAME_LABEL"
+			size="40"
 		/>
 
 		<field

administrator/components/com_banners/tables/banner.php

@@ -150,8 +150,8 @@ public function bind($array, $ignore = array())
 			$height = abs((int) $registry->get('height', 0));
 
 			// Sets the width and height to an empty string if = 0
-			$registry->set('width', ($width ? $width : ''));
-			$registry->set('height', ($height ? $height : ''));
+			$registry->set('width', $width ?: '');
+			$registry->set('height', $height ?: '');
 
 			$array['params'] = (string) $registry;
 		}

administrator/components/com_banners/views/banners/tmpl/default.php

@@ -156,7 +156,7 @@
 								<?php echo $item->client_name; ?>
 							</td>
 							<td class="small hidden-phone">
-								<?php echo JText::sprintf('COM_BANNERS_IMPRESSIONS', $item->impmade, $item->imptotal ? $item->imptotal : JText::_('COM_BANNERS_UNLIMITED')); ?>
+								<?php echo JText::sprintf('COM_BANNERS_IMPRESSIONS', $item->impmade, $item->imptotal ?: JText::_('COM_BANNERS_UNLIMITED')); ?>
 							</td>
 							<td class="small hidden-phone">
 								<?php echo $item->clicks; ?> -
@@ -180,8 +180,8 @@
 					'bootstrap.renderModal',
 					'collapseModal',
 					array(
-						'title' => JText::_('COM_BANNERS_BATCH_OPTIONS'),
-						'footer' => $this->loadTemplate('batch_footer')
+						'title'  => JText::_('COM_BANNERS_BATCH_OPTIONS'),
+						'footer' => $this->loadTemplate('batch_footer'),
 					),
 					$this->loadTemplate('batch_body')
 				); ?>

administrator/components/com_banners/views/banners/view.html.php

@@ -101,7 +101,7 @@ protected function addToolbar()
 			JToolbarHelper::addNew('banner.add');
 		}
 
-		if (($canDo->get('core.edit')))
+		if ($canDo->get('core.edit'))
 		{
 			JToolbarHelper::editList('banner.edit');
 		}
@@ -173,15 +173,15 @@ protected function addToolbar()
 	protected function getSortFields()
 	{
 		return array(
-			'ordering' => JText::_('JGRID_HEADING_ORDERING'),
-			'a.state' => JText::_('JSTATUS'),
-			'a.name' => JText::_('COM_BANNERS_HEADING_NAME'),
-			'a.sticky' => JText::_('COM_BANNERS_HEADING_STICKY'),
+			'ordering'    => JText::_('JGRID_HEADING_ORDERING'),
+			'a.state'     => JText::_('JSTATUS'),
+			'a.name'      => JText::_('COM_BANNERS_HEADING_NAME'),
+			'a.sticky'    => JText::_('COM_BANNERS_HEADING_STICKY'),
 			'client_name' => JText::_('COM_BANNERS_HEADING_CLIENT'),
-			'impmade' => JText::_('COM_BANNERS_HEADING_IMPRESSIONS'),
-			'clicks' => JText::_('COM_BANNERS_HEADING_CLICKS'),
-			'a.language' => JText::_('JGRID_HEADING_LANGUAGE'),
-			'a.id' => JText::_('JGRID_HEADING_ID')
+			'impmade'     => JText::_('COM_BANNERS_HEADING_IMPRESSIONS'),
+			'clicks'      => JText::_('COM_BANNERS_HEADING_CLICKS'),
+			'a.language'  => JText::_('JGRID_HEADING_LANGUAGE'),
+			'a.id'        => JText::_('JGRID_HEADING_ID'),
 		);
 	}
 }

administrator/components/com_banners/views/clients/tmpl/default.php

@@ -27,7 +27,7 @@
 $userId     = $user->get('id');
 $listOrder  = $this->escape($this->state->get('list.ordering'));
 $listDirn   = $this->escape($this->state->get('list.direction'));
-$params     = (isset($this->state->params)) ? $this->state->params : new JObject;
+$params     = isset($this->state->params) ? $this->state->params : new JObject;
 ?>
 <form action="<?php echo JRoute::_('index.php?option=com_banners&view=clients'); ?>" method="post" name="adminForm" id="adminForm">
 	<div id="j-sidebar-container" class="span2">

administrator/components/com_cache/views/cache/tmpl/default.php

@@ -67,7 +67,7 @@
 							<?php echo $item->count; ?>
 						</td>
 						<td>
-							<?php echo JHtml::_('number.bytes', $item->size*1024); ?>
+							<?php echo JHtml::_('number.bytes', $item->size); ?>
 						</td>
 					</tr>
 				<?php $i++; endforeach; ?>

administrator/components/com_categories/models/category.php

@@ -480,7 +480,7 @@ public function save($data)
 		$isNew      = true;
 		$context    = $this->option . '.' . $this->name;
 
-		if ((!empty($data['tags']) && $data['tags'][0] != ''))
+		if (!empty($data['tags']) && $data['tags'][0] != '')
 		{
 			$table->newTags = $data['tags'];
 		}