Merge branch '5.1-dev' into js-improvements

joomla · Mar 2, 2024 · d1786a3 · d1786a3
2 parents 376b5d9 + 4ffa3e0
commit d1786a3
Show file tree

Hide file tree

Showing 143 changed files with 1,080 additions and 443 deletions.
diff --git a/administrator/components/com_admin/script.php b/administrator/components/com_admin/script.php
@@ -22,6 +22,7 @@
 use Joomla\CMS\Table\Table;
 use Joomla\CMS\Uri\Uri;
 use Joomla\Database\ParameterType;
+use Joomla\Filesystem\Path;
 use Joomla\Registry\Registry;
 
 // phpcs:disable PSR1.Files.SideEffects
@@ -2461,7 +2462,7 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)
         }
 
         foreach ($folders as $folder) {
-            if ($folderExists = Folder::exists(JPATH_ROOT . $folder)) {
+            if ($folderExists = is_dir(Path::clean(JPATH_ROOT . $folder))) {
                 $status['folders_exist'][] = $folder;
 
                 if ($dryRun === false) {

diff --git a/administrator/components/com_admin/src/Model/HelpModel.php b/administrator/components/com_admin/src/Model/HelpModel.php
@@ -11,10 +11,10 @@
 namespace Joomla\Component\Admin\Administrator\Model;
 
 use Joomla\CMS\Factory;
-use Joomla\CMS\Filesystem\Folder;
 use Joomla\CMS\Help\Help;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Model\BaseDatabaseModel;
+use Joomla\Filesystem\Folder;
 use Joomla\String\StringHelper;
 
 // phpcs:disable PSR1.Files.SideEffects

diff --git a/administrator/components/com_banners/src/Helper/BannersHelper.php b/administrator/components/com_banners/src/Helper/BannersHelper.php
@@ -38,10 +38,10 @@ class BannersHelper extends ContentHelper
      */
     public static function updateReset()
     {
-        $db   = Factory::getDbo();
-        $date = Factory::getDate();
-        $app  = Factory::getApplication();
-        $user = $app->getIdentity();
+        $db      = Factory::getDbo();
+        $nowDate = Factory::getDate()->toSql();
+        $app     = Factory::getApplication();
+        $user    = $app->getIdentity();
 
         $query = $db->getQuery(true)
             ->select('*')
@@ -52,7 +52,7 @@ public static function updateReset()
                     $db->quoteName('reset') . ' IS NOT NULL',
                 ]
             )
-            ->bind(':date', $date)
+            ->bind(':date', $nowDate)
             ->extendWhere(
                 'AND',
                 [

diff --git a/administrator/components/com_banners/src/Model/TracksModel.php b/administrator/components/com_banners/src/Model/TracksModel.php
@@ -13,11 +13,11 @@
 use Joomla\Archive\Archive;
 use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Factory;
-use Joomla\CMS\Filesystem\Folder;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Model\ListModel;
 use Joomla\Database\ParameterType;
 use Joomla\Filesystem\File;
+use Joomla\Filesystem\Folder;
 use Joomla\String\StringHelper;
 
 // phpcs:disable PSR1.Files.SideEffects

diff --git a/administrator/components/com_banners/tmpl/clients/default.php b/administrator/components/com_banners/tmpl/clients/default.php
@@ -71,22 +71,30 @@
                                 <th scope="col" class="w-15 d-none d-md-table-cell">
                                     <?php echo HTMLHelper::_('searchtools.sort', 'COM_BANNERS_HEADING_CONTACT', 'a.contact', $listDirn, $listOrder); ?>
                                 </th>
-                                <th scope="col" class="w-3 text-center d-none d-md-table-cell">
-                                    <span class="icon-check" aria-hidden="true" title="<?php echo Text::_('COM_BANNERS_COUNT_PUBLISHED_ITEMS'); ?>"></span>
-                                    <span class="visually-hidden"><?php echo Text::_('COM_BANNERS_COUNT_PUBLISHED_ITEMS'); ?></span>
-                                </th>
-                                <th scope="col" class="w-3 text-center d-none d-md-table-cell">
-                                    <span class="icon-times" aria-hidden="true" title="<?php echo Text::_('COM_BANNERS_COUNT_UNPUBLISHED_ITEMS'); ?>"></span>
-                                    <span class="visually-hidden"><?php echo Text::_('COM_BANNERS_COUNT_UNPUBLISHED_ITEMS'); ?></span>
-                                </th>
-                                <th scope="col" class="w-3 text-center d-none d-md-table-cell">
-                                    <span class="icon-folder icon-fw" aria-hidden="true" title="<?php echo Text::_('COM_BANNERS_COUNT_ARCHIVED_ITEMS'); ?>"></span>
-                                    <span class="visually-hidden"><?php echo Text::_('COM_BANNERS_COUNT_ARCHIVED_ITEMS'); ?></span>
-                                </th>
-                                <th scope="col" class="w-3 text-center d-none d-md-table-cell">
-                                    <span class="icon-trash" aria-hidden="true" title="<?php echo Text::_('COM_BANNERS_COUNT_TRASHED_ITEMS'); ?>"></span>
-                                    <span class="visually-hidden"><?php echo Text::_('COM_BANNERS_COUNT_TRASHED_ITEMS'); ?></span>
-                                </th>
+                                <?php if (isset($this->items[0]) && property_exists($this->items[0], 'count_published')) : ?>
+                                    <th scope="col" class="w-10 text-center d-none d-md-table-cell">
+                                        <span class="icon-check" aria-hidden="true"></span>
+                                        <span class="d-none d-lg-inline"><?php echo Text::_('COM_BANNERS_COUNT_PUBLISHED_ITEMS'); ?></span>
+                                    </th>
+                                <?php endif; ?>
+                                <?php if (isset($this->items[0]) && property_exists($this->items[0], 'count_unpublished')) : ?>
+                                    <th scope="col" class="w-10 text-center d-none d-md-table-cell">
+                                        <span class="icon-times" aria-hidden="true"></span>
+                                        <span class="d-none d-lg-inline"><?php echo Text::_('COM_BANNERS_COUNT_UNPUBLISHED_ITEMS'); ?></span>
+                                    </th>
+                                <?php endif; ?>
+                                <?php if (isset($this->items[0]) && property_exists($this->items[0], 'count_archived')) : ?>
+                                    <th scope="col" class="w-10 text-center d-none d-md-table-cell">
+                                        <span class="icon-folder icon-fw" aria-hidden="true"></span>
+                                        <span class="d-none d-lg-inline"><?php echo Text::_('COM_BANNERS_COUNT_ARCHIVED_ITEMS'); ?></span>
+                                    </th>
+                                <?php endif; ?>
+                                <?php if (isset($this->items[0]) && property_exists($this->items[0], 'count_trashed')) : ?>
+                                    <th scope="col" class="w-10 text-center d-none d-md-table-cell">
+                                        <span class="icon-trash" aria-hidden="true"></span>
+                                        <span class="d-none d-lg-inline"><?php echo Text::_('COM_BANNERS_COUNT_TRASHED_ITEMS'); ?></span>
+                                    </th>
+                                <?php endif; ?>
                                 <th scope="col" class="w-10 d-none d-md-table-cell">
                                     <?php echo HTMLHelper::_('searchtools.sort', 'COM_BANNERS_HEADING_PURCHASETYPE', 'a.purchase_type', $listDirn, $listOrder); ?>
                                 </th>