Merge remote-tracking branch 'upstream/4.0-dev' into fix-24782

joomla · Sep 4, 2019 · a9cc0d5 · a9cc0d5
2 parents 4c92e64 + 737e4f1
commit a9cc0d5
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/administrator/components/com_cache/tmpl/cache/default.php b/administrator/components/com_cache/tmpl/cache/default.php
@@ -26,7 +26,12 @@
 		<div class="col-md-12">
 			<div id="j-main-container" class="j-main-container">
 				<?php echo LayoutHelper::render('joomla.searchtools.default', ['view' => $this]); ?>
-				<?php if (count($this->data) > 0) : ?>
+				<?php if (empty($this->items)) : ?>
+					<div class="alert alert-info">
+						<span class="fa fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
+						<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+					</div>
+				<?php else : ?>
 				<table class="table">
 					<caption id="captionTable" class="sr-only">
 						<?php echo Text::_('COM_CACHE_TABLE_CAPTION'); ?>, <?php echo Text::_('JGLOBAL_SORTED_BY'); ?>

diff --git a/administrator/components/com_fields/Dispatcher/Dispatcher.php b/administrator/components/com_fields/Dispatcher/Dispatcher.php
@@ -16,7 +16,7 @@
 use Joomla\Component\Fields\Administrator\Helper\FieldsHelper;
 
 /**
- * ComponentDispatcher class for com_content
+ * ComponentDispatcher class for com_fields
  *
  * @since  4.0.0
  */

diff --git a/build/media_source/mod_login/js/admin-login.es6.js b/build/media_source/mod_login/js/admin-login.es6.js
@@ -39,6 +39,8 @@
 
           if (element.hasAttribute('name') && element.nodeName === 'INPUT') {
             segments.push(`${encodeURIComponent(element.name)}=${encodeURIComponent(element.value)}`);
+          } else if (element.hasAttribute('name') && element.nodeName === 'SELECT' && element.value.length > 0) {
+            segments.push(`${encodeURIComponent(element.name)}=${encodeURIComponent(element.value)}`);
           }
         }