Merge branch 'refs/heads/5.2-backup' into 5.2-dev

Author: pe7er

administrator/components/com_admin/script.php

@@ -3002,7 +3002,7 @@ private function migrateTinymceConfiguration(): bool
     /**
      * setup Guided Tours Unique Identifiers
      *
-     * @return  boolean  True on success
+     * @return  void
      *
      * @since   5.0.0
      */

administrator/components/com_categories/src/Model/CategoryModel.php

@@ -752,6 +752,8 @@ public function publish(&$pks, $value = 1)
 
             return true;
         }
+
+        return false;
     }
 
     /**

administrator/components/com_languages/src/Model/OverridesModel.php

@@ -233,7 +233,7 @@ public function delete($cids)
     /**
      * Removes all of the cached strings from the table.
      *
-     * @return  boolean  result of operation
+     * @return  void|\RuntimeException
      *
      * @since   3.4.2
      */

administrator/components/com_menus/src/Controller/MenuController.php

@@ -180,6 +180,8 @@ public function save($key = null, $urlVar = null)
                 $this->setRedirect(Route::_('index.php?option=com_menus&view=menus', false));
                 break;
         }
+
+        return true;
     }
 
     /**

administrator/components/com_modules/src/Controller/ModuleController.php

@@ -258,7 +258,7 @@ public function save($key = null, $urlVar = null)
     /**
      * Method to get the other modules in the same position
      *
-     * @return  string  The data for the Ajax request.
+     * @return  void
      *
      * @since   3.6.3
      */
@@ -303,7 +303,7 @@ public function orderPosition()
         } catch (\RuntimeException $e) {
             $app->enqueueMessage($e->getMessage(), 'error');
 
-            return '';
+            return;
         }
 
         $orders2 = [];

administrator/language/en-GB/lib_joomla.ini

@@ -454,6 +454,7 @@ JLIB_HTML_NO_RECORDS_FOUND="No records found."
 JLIB_HTML_PAGE_CURRENT="Page %s"
 JLIB_HTML_PAGE_CURRENT_OF_TOTAL="Page %s of %s"
 JLIB_HTML_PAGINATION="Pagination"
+JLIB_HTML_PAGINATION_NUMBERS="%1$d - %2$d / %3$d items"
 JLIB_HTML_PLEASE_MAKE_A_SELECTION_FROM_THE_LIST="Please first make a selection from the list."
 JLIB_HTML_PUBLISH_ITEM="Publish Item"
 JLIB_HTML_PUBLISHED_EXPIRED_ITEM="Published, but has Expired."

language/en-GB/lib_joomla.ini

@@ -448,6 +448,7 @@ JLIB_HTML_NO_RECORDS_FOUND="No records found."
 JLIB_HTML_PAGE_CURRENT="Page %s"
 JLIB_HTML_PAGE_CURRENT_OF_TOTAL="Page %s of %s"
 JLIB_HTML_PAGINATION="Pagination"
+JLIB_HTML_PAGINATION_NUMBERS="%1$d - %2$d / %3$d items"
 JLIB_HTML_PLEASE_MAKE_A_SELECTION_FROM_THE_LIST="Please first make a selection from the list."
 JLIB_HTML_PUBLISH_ITEM="Publish Item"
 JLIB_HTML_PUBLISHED_EXPIRED_ITEM="Published, but has Expired."

layouts/joomla/pagination/links.php

@@ -16,12 +16,14 @@
 
 $list  = $displayData['list'];
 $pages = $list['pages'];
+$total = $list['total'];
 
 $options = new Registry($displayData['options']);
 
-$showLimitBox   = $options->get('showLimitBox', false);
-$showPagesLinks = $options->get('showPagesLinks', true);
-$showLimitStart = $options->get('showLimitStart', true);
+$showLimitBox     = $options->get('showLimitBox', false);
+$showPagesLinks   = $options->get('showPagesLinks', true);
+$showLimitStart   = $options->get('showLimitStart', true);
+$showItemPosition = $options->get('showItemPosition', true);
 
 // Calculate to display range of pages
 $currentPage = 1;
@@ -43,21 +45,29 @@
         $range = ceil($currentPage / $step);
     }
 }
-?>
-
+$first = ($currentPage - 1) * $list['limit'] + 1;
+$last  = $first + $list['limit'] - 1;
+$last  = $last > $total ? $total : $last;
 
-<?php if (!empty($pages)) : ?>
+?>
+<?php if (!empty($pages) || $showItemPosition) : ?>
     <nav class="pagination__wrapper" aria-label="<?php echo Text::_('JLIB_HTML_PAGINATION'); ?>">
-        <div class="pagination pagination-toolbar text-center">
+        <?php if ($showItemPosition) : ?>
+            <div class="text-end me-3">
+                <?php echo Text::sprintf('JLIB_HTML_PAGINATION_NUMBERS', $first, $last, $total); ?>
+            </div>
+        <?php endif; ?>
+
+        <div class="pagination pagination-toolbar text-center mt-0">
 
             <?php if ($showLimitBox) : ?>
                 <div class="limit float-end">
                     <?php echo Text::_('JGLOBAL_DISPLAY_NUM') . $list['limitfield']; ?>
                 </div>
             <?php endif; ?>
 
-            <?php if ($showPagesLinks) : ?>
-                <ul class="pagination ms-auto mb-4 me-0">
+            <?php if ($showPagesLinks && !empty($pages)) : ?>
+                <ul class="pagination ms-auto me-0">
                     <?php echo LayoutHelper::render('joomla.pagination.link', $pages['start']); ?>
                     <?php echo LayoutHelper::render('joomla.pagination.link', $pages['previous']); ?>
                     <?php foreach ($pages['pages'] as $k => $page) : ?>

libraries/src/HTML/Helpers/Select.php

@@ -631,7 +631,14 @@ public static function radiolist(
         $idtag = false,
         $translate = false
     ) {
+        $class = '';
+
         if (\is_array($attribs)) {
+            if (\array_key_exists('class', $attribs)) {
+                $class = ' ' . $attribs['class'];
+                unset($attribs['class']);
+            }
+
             $attribs = ArrayHelper::toString($attribs);
         }
 
@@ -662,7 +669,7 @@ public static function radiolist(
                 $extra .= ((string) $k === (string) $selected ? ' checked="checked" ' : '');
             }
 
-            $html .= '<input type="radio" class="form-check-input" name="' . $name . '" id="' . $id . '" value="' . $k . '" '
+            $html .= '<input type="radio" class="form-check-input' . $class . '" name="' . $name . '" id="' . $id . '" value="' . $k . '" '
                     . $extra . $attribs . '>';
             $html .= '<label for="' . $id . '" class="form-check-label" id="' . $id . '-lbl">' . $t . '</label>';
             $html .= '</div>';