Merge branch '4.2-dev' into 4.2-dev-fix-mod-quickicon-manifest-xml

joomla · Jul 29, 2022 · 6e09e59 · 6e09e59
2 parents fdaa4cd + 935bf48
commit 6e09e59
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/administrator/components/com_users/tmpl/methods/list.php b/administrator/components/com_users/tmpl/methods/list.php
@@ -70,11 +70,11 @@ class="img-fluid"
                             <div class="com-users-methods-list-method-record d-flex flex-row flex-wrap justify-content-start border-top py-2">
                                 <div class="com-users-methods-list-method-record-info flex-grow-1 d-flex flex-column align-items-start gap-1">
                                     <?php if ($methodName === 'backupcodes') : ?>
-                                        <div class="alert alert-info mt-1 w-100">
-                                            <?php if ($canAddEdit) : ?>
+                                        <?php if ($canAddEdit) : ?>
+                                            <div class="alert alert-info mt-1 w-100">
                                                 <?php echo Text::sprintf('COM_USERS_MFA_BACKUPCODES_PRINT_PROMPT_HEAD', Route::_('index.php?option=com_users&task=method.edit&id=' . (int) $record->id . ($this->returnURL ? '&returnurl=' . $this->escape(urlencode($this->returnURL)) : '') . '&user_id=' . $this->user->id)) ?>
-                                            <?php endif ?>
-                                        </div>
+                                            </div>
+                                        <?php endif ?>
                                     <?php else : ?>
                                         <h4 class="com-users-methods-list-method-record-title-container mb-1 fs-3">
                                             <?php if ($record->default) : ?>

diff --git a/administrator/manifests/files/joomla.xml b/administrator/manifests/files/joomla.xml
@@ -6,7 +6,7 @@
 	<authorUrl>www.joomla.org</authorUrl>
 	<copyright>(C) 2019 Open Source Matters, Inc.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
-	<version>4.2.0-dev</version>
+	<version>4.2.0-rc2-dev</version>
 	<creationDate>2022-07</creationDate>
 	<description>FILES_JOOMLA_XML_DESCRIPTION</description>
 

diff --git a/components/com_users/tmpl/methods/list.php b/components/com_users/tmpl/methods/list.php
@@ -70,11 +70,11 @@ class="img-fluid"
                             <div class="com-users-methods-list-method-record d-flex flex-row flex-wrap justify-content-start border-top py-2">
                                 <div class="com-users-methods-list-method-record-info flex-grow-1 d-flex flex-column align-items-start gap-1">
                                     <?php if ($methodName === 'backupcodes') : ?>
-                                        <div class="alert alert-info mt-1 w-100">
-                                            <?php if ($canAddEdit) : ?>
+                                        <?php if ($canAddEdit) : ?>
+                                            <div class="alert alert-info mt-1 w-100">
                                                 <?php echo Text::sprintf('COM_USERS_MFA_BACKUPCODES_PRINT_PROMPT_HEAD', Route::_('index.php?option=com_users&task=method.edit&id=' . (int) $record->id . ($this->returnURL ? '&returnurl=' . $this->escape(urlencode($this->returnURL)) : '') . '&user_id=' . $this->user->id)) ?>
-                                            <?php endif ?>
-                                        </div>
+                                            </div>
+                                        <?php endif ?>
                                     <?php else : ?>
                                         <h3 class="com-users-methods-list-method-record-title-container mb-1 fs-5">
                                             <?php if ($record->default) : ?>

diff --git a/layouts/plugins/system/webauthn/manage.php b/layouts/plugins/system/webauthn/manage.php
@@ -126,7 +126,7 @@
         <?php
         if (empty($credentials)) : ?>
             <tr>
-                <td colspan="2">
+                <td colspan="<?php echo $attestationSupport ? '3' : '2'; ?>">
                     <?php echo Text::_('PLG_SYSTEM_WEBAUTHN_MANAGE_HEADER_NOMETHODS_LABEL') ?>
                 </td>
             </tr>

diff --git a/libraries/src/Version.php b/libraries/src/Version.php
@@ -62,7 +62,7 @@ final class Version
      * @var    string
      * @since  3.8.0
      */
-    public const EXTRA_VERSION = 'dev';
+    public const EXTRA_VERSION = 'rc2-dev';
 
     /**
      * Development status.