Click to expand the diff!
```diff
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
index 1d93159ad7e7b..4c6103b5b360e 100644
--- a/.php-cs-fixer.dist.php
+++ b/.php-cs-fixer.dist.php
@@ -82,6 +82,8 @@
'no_unused_imports' => true,
// Classes from the global namespace should not be imported
'global_namespace_import' => ['import_classes' => false, 'import_constants' => false, 'import_functions' => false],
+ // Alpha order imports
+ 'ordered_imports' => ['imports_order' => ['class', 'function', 'const'], 'sort_algorithm' => 'alpha'],
]
)
->setFinder($finder);
diff --git a/administrator/components/com_categories/src/Model/CategoriesModel.php b/administrator/components/com_categories/src/Model/CategoriesModel.php
index d144471c31873..48d0e3e0a091a 100644
--- a/administrator/components/com_categories/src/Model/CategoriesModel.php
+++ b/administrator/components/com_categories/src/Model/CategoriesModel.php
@@ -174,7 +174,7 @@ protected function getListQuery()
'a.id, a.title, a.alias, a.note, a.published, a.access' .
', a.checked_out, a.checked_out_time, a.created_user_id' .
', a.path, a.parent_id, a.level, a.lft, a.rgt' .
- ', a.language'
+ ', a.language, a.description'
)
);
$query->from($db->quoteName('#__categories', 'a'));
diff --git a/administrator/components/com_fields/src/Helper/FieldsHelper.php b/administrator/components/com_fields/src/Helper/FieldsHelper.php
index f6afbd77637f5..fc3b430564eba 100644
--- a/administrator/components/com_fields/src/Helper/FieldsHelper.php
+++ b/administrator/components/com_fields/src/Helper/FieldsHelper.php
@@ -18,8 +18,8 @@
use Joomla\CMS\Layout\LayoutHelper;
use Joomla\CMS\Object\CMSObject;
use Joomla\CMS\Plugin\PluginHelper;
-use Joomla\Component\Fields\Administrator\Model\FieldsModel;
use Joomla\Component\Fields\Administrator\Model\FieldModel;
+use Joomla\Component\Fields\Administrator\Model\FieldsModel;
use Joomla\Database\ParameterType;
// phpcs:disable PSR1.Files.SideEffects
diff --git a/administrator/components/com_guidedtours/src/View/Steps/HtmlView.php b/administrator/components/com_guidedtours/src/View/Steps/HtmlView.php
index 9deed99012dc7..abf3b07aede2a 100644
--- a/administrator/components/com_guidedtours/src/View/Steps/HtmlView.php
+++ b/administrator/components/com_guidedtours/src/View/Steps/HtmlView.php
@@ -15,9 +15,9 @@
use Joomla\CMS\Language\Text;
use Joomla\CMS\MVC\View\GenericDataException;
use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
+use Joomla\CMS\Router\Route;
use Joomla\CMS\Toolbar\Toolbar;
use Joomla\CMS\Toolbar\ToolbarHelper;
-use Joomla\CMS\Router\Route;
// phpcs:disable PSR1.Files.SideEffects
\defined('_JEXEC') or die;
diff --git a/administrator/components/com_installer/src/Model/ManageModel.php b/administrator/components/com_installer/src/Model/ManageModel.php
index 4520c9f4ea20a..d6a5932d8ec6c 100644
--- a/administrator/components/com_installer/src/Model/ManageModel.php
+++ b/administrator/components/com_installer/src/Model/ManageModel.php
@@ -56,6 +56,7 @@ public function __construct($config = [], MVCFactoryInterface $factory = null)
'package_id',
'extension_id',
'creationDate',
+ 'core',
];
}
diff --git a/administrator/components/com_languages/src/Controller/InstalledController.php b/administrator/components/com_languages/src/Controller/InstalledController.php
index 421f787394356..d92d01a8d93af 100644
--- a/administrator/components/com_languages/src/Controller/InstalledController.php
+++ b/administrator/components/com_languages/src/Controller/InstalledController.php
@@ -11,8 +11,8 @@
namespace Joomla\Component\Languages\Administrator\Controller;
use Joomla\CMS\Factory;
-use Joomla\CMS\Language\LanguageHelper;
use Joomla\CMS\Language\Language;
+use Joomla\CMS\Language\LanguageHelper;
use Joomla\CMS\Language\Multilanguage;
use Joomla\CMS\Language\Text;
use Joomla\CMS\MVC\Controller\BaseController;
diff --git a/api/components/com_categories/src/View/Categories/JsonapiView.php b/api/components/com_categories/src/View/Categories/JsonapiView.php
index 25a63ba4b14a7..360a5ba3f03a2 100644
--- a/api/components/com_categories/src/View/Categories/JsonapiView.php
+++ b/api/components/com_categories/src/View/Categories/JsonapiView.php
@@ -57,6 +57,7 @@ class JsonapiView extends BaseApiView
'count_published',
'count_archived',
'params',
+ 'description',
];
/**
@@ -90,6 +91,7 @@ class JsonapiView extends BaseApiView
'count_published',
'count_archived',
'params',
+ 'description',
];
/**
diff --git a/components/com_contact/src/Model/ContactModel.php b/components/com_contact/src/Model/ContactModel.php
index 817cb03436be5..3d8366042633a 100644
--- a/components/com_contact/src/Model/ContactModel.php
+++ b/components/com_contact/src/Model/ContactModel.php
@@ -331,7 +331,7 @@ protected function buildContactExtendedData($contact)
// Filter per language if plugin published
if (Multilanguage::isEnabled()) {
- $language = [Factory::getLanguage()->getTag(), $db->quote('*')];
+ $language = [Factory::getLanguage()->getTag(), '*'];
$query->whereIn($db->quoteName('a.language'), $language, ParameterType::STRING);
}
diff --git a/installation/language/af-ZA/langmetadata.xml b/installation/language/af-ZA/langmetadata.xml
index fdfab17fc6d6a..9fc30270d9567 100644
--- a/installation/language/af-ZA/langmetadata.xml
+++ b/installation/language/af-ZA/langmetadata.xml
@@ -2,7 +2,7 @@
Afrikaans (Suid-Afrika)4.3.4
- 2023-07
+ 2023-08Afrikaans Translation Team(C) 2005 Open Source Matters, Inc.GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/installation/language/ar-AA/langmetadata.xml b/installation/language/ar-AA/langmetadata.xml
index f09ef853d616d..5053fff3e436e 100644
--- a/installation/language/ar-AA/langmetadata.xml
+++ b/installation/language/ar-AA/langmetadata.xml
@@ -2,7 +2,7 @@
Arabic (اللغة العربية)4.3.4
- 2023-07
+ 2023-08Dr. Ashraf Damra(C) 2005 Open Source Matters, Inc.GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/installation/language/bg-BG/joomla.ini b/installation/language/bg-BG/joomla.ini
index 86c8152872e94..4c567cdc4b89f 100644
--- a/installation/language/bg-BG/joomla.ini
+++ b/installation/language/bg-BG/joomla.ini
@@ -85,7 +85,7 @@ INSTL_DATABASE_PREFIX_DUPLICATE_DESC="Ако използвате съществ
INSTL_DATABASE_PREFIX_MSG="Префиксът на таблицата трябва да започва с буква и по избор да бъде последван от буквено -цифрови знаци и долна черта"
INSTL_DATABASE_RESPONSE_ERROR="Инсталирането е неуспешно."
INSTL_DATABASE_TYPE_DESC="Изберете тип база данни."
-INSTL_DATABASE_USER_DESC="Потребителско име, което сте създали или което Ви е предоставено от ходтинга."
+INSTL_DATABASE_USER_DESC="Въведете парола която сте създали или е предоставена от хостинга Ви."
INSTL_DATABASE_VALIDATION_ERROR="Проверете идентификационните данни на базата данни, типа на базата данни, името на базата данни или името на хоста. Ако имате инсталиран MySQL 8, моля, прочетете това wiki за повече информация."
INSTL_CONNECT_DB="Настройка на връзка с база данни"
diff --git a/installation/language/bg-BG/langmetadata.xml b/installation/language/bg-BG/langmetadata.xml
index 183de34827ecb..0893e80933312 100644
--- a/installation/language/bg-BG/langmetadata.xml
+++ b/installation/language/bg-BG/langmetadata.xml
@@ -2,7 +2,7 @@
Bulgarian (bg-BG)4.3.4
- 2023-07
+ 2023-08Joomla! Bulgaria(C) 2005 Open Source Matters, Inc.GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/installation/language/ca-ES/langmetadata.xml b/installation/language/ca-ES/langmetadata.xml
index 80b80cfc942f4..181621f4a36a3 100644
--- a/installation/language/ca-ES/langmetadata.xml
+++ b/installation/language/ca-ES/langmetadata.xml
@@ -2,7 +2,7 @@
Catalan (ca-ES)4.3.4
- 2023-07
+ 2023-08Catalan Translation Team(C) 2005 Open Source Matters, Inc.GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/installation/language/cs-CZ/langmetadata.xml b/installation/language/cs-CZ/langmetadata.xml
index 92cf85ffbf794..b31013aee06d5 100644
--- a/installation/language/cs-CZ/langmetadata.xml
+++ b/installation/language/cs-CZ/langmetadata.xml
@@ -2,7 +2,7 @@
Czech (Čeština)4.3.4
- 2023-07
+ 2023-08Czech Translation Team(C) 2005 Open Source Matters, Inc.GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/installation/language/cy-GB/langmetadata.xml b/installation/language/cy-GB/langmetadata.xml
index a6af80d8863b2..73e119f1cc0d7 100644
--- a/installation/language/cy-GB/langmetadata.xml
+++ b/installation/language/cy-GB/langmetadata.xml
@@ -2,7 +2,7 @@
Welsh (United Kingdom)4.3.4
- 2023-07
+ 2023-08Joomla! Project - Welsh Translation Team(C) 2005 Open Source Matters, Inc.GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/installation/language/da-DK/langmetadata.xml b/installation/language/da-DK/langmetadata.xml
index da2b32c85337f..7dad2a7427491 100644
--- a/installation/language/da-DK/langmetadata.xml
+++ b/installation/language/da-DK/langmetadata.xml
@@ -2,7 +2,7 @@
Danish (Danmark)4.3.4
- 2023-07
+ 2023-08Danish Translation Team (Transl.: Ronny Buelund)(C) 2005 Open Source Matters, Inc.GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/installation/language/el-GR/langmetadata.xml b/installation/language/el-GR/langmetadata.xml
index 805a5c3de1bea..a5179f10f1dc2 100644
--- a/installation/language/el-GR/langmetadata.xml
+++ b/installation/language/el-GR/langmetadata.xml
@@ -2,7 +2,7 @@
Greek (el-GR)4.3.4
- 2023-07
+ 2023-08Ομάδα Μετάφρασης: joomla. gr(C) 2005 Open Source Matters, Inc.GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/installation/language/en-AU/langmetadata.xml b/installation/language/en-AU/langmetadata.xml
index 6cb3efa168c58..bf2913d31ee84 100644
--- a/installation/language/en-AU/langmetadata.xml
+++ b/installation/language/en-AU/langmetadata.xml
@@ -2,7 +2,7 @@
English (Australia)4.3.4
- 2023-07
+ 2023-08Joomla! Project(C) 2005 Open Source Matters, Inc.GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/installation/language/en-CA/langmetadata.xml b/installation/language/en-CA/langmetadata.xml
index 00a5708f496d8..0b64d6e1d158b 100644
--- a/installation/language/en-CA/langmetadata.xml
+++ b/installation/language/en-CA/langmetadata.xml
@@ -2,7 +2,7 @@
English (Canada)4.3.4
- 2023-07
+ 2023-08Joomla! Project(C) 2005 Open Source Matters, Inc.GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/installation/language/en-NZ/langmetadata.xml b/installation/language/en-NZ/langmetadata.xml
index c19c0dd1ae50c..6d0b799b1e1c5 100644
--- a/installation/language/en-NZ/langmetadata.xml
+++ b/installation/language/en-NZ/langmetadata.xml
@@ -2,7 +2,7 @@
English (New Zealand)4.3.4
- 2023-07
+ 2023-08Joomla! Project(C) 2005 Open Source Matters, Inc.GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/installation/language/en-US/langmetadata.xml b/installation/language/en-US/langmetadata.xml
index b06164ff52604..e42d8ebafe6b6 100644
--- a/installation/language/en-US/langmetadata.xml
+++ b/installation/language/en-US/langmetadata.xml
@@ -2,7 +2,7 @@
English (United States)4.3.4
- 2023-07
+ 2023-08Joomla! Project(C) 2005 Open Source Matters, Inc.GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/installation/language/es-ES/langmetadata.xml b/installation/language/es-ES/langmetadata.xml
index 793e64e6d388e..ff489bdf3664a 100644
--- a/installation/language/es-ES/langmetadata.xml
+++ b/installation/language/es-ES/langmetadata.xml
@@ -2,7 +2,7 @@
Spanish (Spain)4.3.4
- 2023-07
+ 2023-08Spanish [es-ES] Translation Team(C) 2005 Open Source Matters, Inc.GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/installation/language/et-EE/langmetadata.xml b/installation/language/et-EE/langmetadata.xml
index 980d807ae3f10..a578771d218c9 100644
--- a/installation/language/et-EE/langmetadata.xml
+++ b/installation/language/et-EE/langmetadata.xml
@@ -2,7 +2,7 @@
Estonian4.3.4
- 2023-07
+ 2023-08Joomla! Project(C) 2005 Open Source Matters, Inc.GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/installation/language/eu-ES/langmetadata.xml b/installation/language/eu-ES/langmetadata.xml
index 4d371dc977eb3..96c208c7e4ece 100644
--- a/installation/language/eu-ES/langmetadata.xml
+++ b/installation/language/eu-ES/langmetadata.xml
@@ -2,7 +2,7 @@
Basque4.3.4
- 2023-07
+ 2023-08Joomla! Basque Translation Team(C) 2005 Open Source Matters, Inc.GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/installation/language/fa-AF/langmetadata.xml b/installation/language/fa-AF/langmetadata.xml
index ef8d4f0fbacdc..03a5659d16c0d 100644
--- a/installation/language/fa-AF/langmetadata.xml
+++ b/installation/language/fa-AF/langmetadata.xml
@@ -2,7 +2,7 @@
فارسی (دری)4.3.4
- 2023-07
+ 2023-08JoomlaPersian Translation Team(C) 2005 Open Source Matters, Inc.GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/installation/language/fa-IR/langmetadata.xml b/installation/language/fa-IR/langmetadata.xml
index 9e0147882e658..b90c4ba1856e3 100644
--- a/installation/language/fa-IR/langmetadata.xml
+++ b/installation/language/fa-IR/langmetadata.xml
@@ -2,7 +2,7 @@
Persian (پارسی)4.3.4
- 2023-07
+ 2023-08JoomlaFarsi.Com Team(C) 2005 Open Source Matters, Inc.GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/installation/language/fi-FI/langmetadata.xml b/installation/language/fi-FI/langmetadata.xml
index 628f668fafe99..41e139f968c56 100644
--- a/installation/language/fi-FI/langmetadata.xml
+++ b/installation/language/fi-FI/langmetadata.xml
@@ -2,7 +2,7 @@
Finnish (Suomi)4.3.4
- 2023-07
+ 2023-08Finnish translation team: Joomla.fi(C) 2005 Open Source Matters, Inc.GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/installation/language/fr-FR/langmetadata.xml b/installation/language/fr-FR/langmetadata.xml
index 6a9e21ca232ef..8cc6dd2029643 100644
--- a/installation/language/fr-FR/langmetadata.xml
+++ b/installation/language/fr-FR/langmetadata.xml
@@ -2,7 +2,7 @@
French (fr-FR)4.3.4
- 2023-07
+ 2023-08Joomla! Project - French translation team(C) 2005 Open Source Matters, Inc.GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/installation/language/he-IL/langmetadata.xml b/installation/language/he-IL/langmetadata.xml
index c6230e5f4d460..69b9c0790f00c 100644
--- a/installation/language/he-IL/langmetadata.xml
+++ b/installation/language/he-IL/langmetadata.xml
@@ -2,7 +2,7 @@
Hebrew (Israel)4.3.4
- 2023-07
+ 2023-08Joomla! Project(C) 2005 Open Source Matters, Inc.GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/installation/language/hr-HR/langmetadata.xml b/installation/language/hr-HR/langmetadata.xml
index 73d9f25b4b54a..eeaa6f3a43318 100644
--- a/installation/language/hr-HR/langmetadata.xml
+++ b/installation/language/hr-HR/langmetadata.xml
@@ -2,7 +2,7 @@
Croatian (Croatia)4.3.4
- 2023-07
+ 2023-08Joomla! Hrvatska team(C) 2005 Open Source Matters, Inc.GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/installation/language/hu-HU/langmetadata.xml b/installation/language/hu-HU/langmetadata.xml
index 32dabc2fb1ed1..37b3d31f19c43 100644
--- a/installation/language/hu-HU/langmetadata.xml
+++ b/installation/language/hu-HU/langmetadata.xml
@@ -2,7 +2,7 @@
Hungarian (Magyar)4.3.4
- 2023-07
+ 2023-08Joomla! Magyarország(C) 2005 Open Source Matters, Inc.GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/installation/language/id-ID/langmetadata.xml b/installation/language/id-ID/langmetadata.xml
index 433a57e5c6c20..c700bb08fae65 100644
--- a/installation/language/id-ID/langmetadata.xml
+++ b/installation/language/id-ID/langmetadata.xml
@@ -2,7 +2,7 @@
Bahasa Indonesia (id)4.3.4
- 2023-07
+ 2023-08Joomla! Indonesia(C) 2005 Open Source Matters, Inc.GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/installation/language/it-IT/langmetadata.xml b/installation/language/it-IT/langmetadata.xml
index 30bb2d91a881b..ff8837b11c696 100644
--- a/installation/language/it-IT/langmetadata.xml
+++ b/installation/language/it-IT/langmetadata.xml
@@ -2,7 +2,7 @@
Italiano (it-IT)4.3.4
- 2023-07
+ 2023-08Joomla! Project (Italian Translation Team)(C) 2005 Open Source Matters, Inc.GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/installation/language/ja-JP/langmetadata.xml b/installation/language/ja-JP/langmetadata.xml
index 3bf30c89a844a..e4b25f7a3232e 100644
--- a/installation/language/ja-JP/langmetadata.xml
+++ b/installation/language/ja-JP/langmetadata.xml
@@ -2,7 +2,7 @@
Japanese (ja-JP)4.3.4
- 2023-07
+ 2023-08Joomla!じゃぱん(C) 2005 Open Source Matters, Inc.GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/installation/language/ka-GE/langmetadata.xml b/installation/language/ka-GE/langmetadata.xml
index 54badc0f8d1e8..281d9890a9bc3 100644
--- a/installation/language/ka-GE/langmetadata.xml
+++ b/installation/language/ka-GE/langmetadata.xml
@@ -2,7 +2,7 @@
Georgian (Georgia)4.3.4
- 2023-07
+ 2023-08Georgian Translation Team(C) 2005 Open Source Matters, Inc.GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/installation/language/kk-KZ/langmetadata.xml b/installation/language/kk-KZ/langmetadata.xml
index e5eb09fc9f2f9..7d3817fcb5524 100644
--- a/installation/language/kk-KZ/langmetadata.xml
+++ b/installation/language/kk-KZ/langmetadata.xml
@@ -2,7 +2,7 @@
Kazakh (Kazakhstan)4.3.4
- 2023-07
+ 2023-08Sarvarov Akylkerey(C) 2005 Open Source Matters, Inc.GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/installation/language/lt-LT/langmetadata.xml b/installation/language/lt-LT/langmetadata.xml
index c72521d58500d..000741fee64d1 100644
--- a/installation/language/lt-LT/langmetadata.xml
+++ b/installation/language/lt-LT/langmetadata.xml
@@ -2,7 +2,7 @@
Lithuanian (Lithuania)4.3.4
- 2023-07
+ 2023-08Oskaras Jankauskas(C) 2005 Open Source Matters, Inc.GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/installation/language/lv-LV/langmetadata.xml b/installation/language/lv-LV/langmetadata.xml
index 7c05537709dfc..4bd1498ee4c70 100644
--- a/installation/language/lv-LV/langmetadata.xml
+++ b/installation/language/lv-LV/langmetadata.xml
@@ -2,7 +2,7 @@
Latvian (Latvia)4.3.4
- 2023-07
+ 2023-08Joomla! Projekts(C) 2005 Open Source Matters, Inc.GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/installation/language/mk-MK/langmetadata.xml b/installation/language/mk-MK/langmetadata.xml
index 2a911ced1948a..0c7f4c9da6aab 100644
--- a/installation/language/mk-MK/langmetadata.xml
+++ b/installation/language/mk-MK/langmetadata.xml
@@ -2,7 +2,7 @@
Macedonian (Macedonia)4.3.4
- 2023-07
+ 2023-08Joomla! Project(C) 2005 Open Source Matters, Inc.GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/installation/language/nl-BE/langmetadata.xml b/installation/language/nl-BE/langmetadata.xml
index 47bc21281ea51..4f48299968f3d 100644
--- a/installation/language/nl-BE/langmetadata.xml
+++ b/installation/language/nl-BE/langmetadata.xml
@@ -2,7 +2,7 @@
Dutch (Belgium)4.3.4
- 2023-07
+ 2023-08Dutch (BE) translation team(C) 2005 Open Source Matters, Inc.GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/installation/language/nl-NL/langmetadata.xml b/installation/language/nl-NL/langmetadata.xml
index c8fb166bf1ebf..7706d62062492 100644
--- a/installation/language/nl-NL/langmetadata.xml
+++ b/installation/language/nl-NL/langmetadata.xml
@@ -2,7 +2,7 @@
Dutch (nl-NL)4.3.4
- 2023-07
+ 2023-08Dutch Translation Team(C) 2005 Open Source Matters, Inc.GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/installation/language/pl-PL/langmetadata.xml b/installation/language/pl-PL/langmetadata.xml
index c9b2fdd6c045f..15f1f0661c213 100644
--- a/installation/language/pl-PL/langmetadata.xml
+++ b/installation/language/pl-PL/langmetadata.xml
@@ -2,7 +2,7 @@
Polish (Poland)4.3.4
- 2023-07
+ 2023-08Projekt Joomla!(C) 2005 Open Source Matters, Inc.GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/installation/language/pt-BR/langmetadata.xml b/installation/language/pt-BR/langmetadata.xml
index ed963adf22adb..a709150683c13 100644
--- a/installation/language/pt-BR/langmetadata.xml
+++ b/installation/language/pt-BR/langmetadata.xml
@@ -2,7 +2,7 @@
Português Brasil (pt-BR)4.3.4
- 2023-07
+ 2023-08Projeto Joomla!(C) 2005 Open Source Matters, Inc.GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/installation/language/pt-PT/langmetadata.xml b/installation/language/pt-PT/langmetadata.xml
index d814931dc8ae1..2360a6bab8de6 100644
--- a/installation/language/pt-PT/langmetadata.xml
+++ b/installation/language/pt-PT/langmetadata.xml
@@ -2,7 +2,7 @@
Português (Portugal)4.3.4
- 2023-07
+ 2023-08Comunidade JoomlaPortugal(C) 2005 Open Source Matters, Inc.GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/installation/language/ro-RO/langmetadata.xml b/installation/language/ro-RO/langmetadata.xml
index c34d3b7ee4007..13692a0477f30 100644
--- a/installation/language/ro-RO/langmetadata.xml
+++ b/installation/language/ro-RO/langmetadata.xml
@@ -2,7 +2,7 @@
Română (România)4.3.4
- 2023-07
+ 2023-08Horia Negura - Quanta(C) 2005 Open Source Matters, Inc.GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/installation/language/sk-SK/langmetadata.xml b/installation/language/sk-SK/langmetadata.xml
index 23cb4f042a302..5585e6c7b2ab0 100644
--- a/installation/language/sk-SK/langmetadata.xml
+++ b/installation/language/sk-SK/langmetadata.xml
@@ -2,7 +2,7 @@
Slovak (Slovakia)4.3.4
- 2023-07
+ 2023-08Slovak translation team : Peter Michnica(C) 2005 Open Source Matters, Inc.GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/installation/language/sl-SI/langmetadata.xml b/installation/language/sl-SI/langmetadata.xml
index 9a3c0975c6600..29233948cea44 100644
--- a/installation/language/sl-SI/langmetadata.xml
+++ b/installation/language/sl-SI/langmetadata.xml
@@ -2,7 +2,7 @@
Slovenščina (Slovenija)4.3.4
- 2023-07
+ 2023-08Slovenska prevajalska ekipa(C) 2005 Open Source Matters, Inc.GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/installation/language/sr-YU/langmetadata.xml b/installation/language/sr-YU/langmetadata.xml
index 5a125a912566d..64b8e5da88e9d 100644
--- a/installation/language/sr-YU/langmetadata.xml
+++ b/installation/language/sr-YU/langmetadata.xml
@@ -2,7 +2,7 @@
Srpski Latinica (Republika Srbija)4.3.4
- 2023-07
+ 2023-08Goran Nešić - UIX Web Design & Saša Matić Bardak.RS(C) 2005 Open Source Matters, Inc.GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/installation/language/sv-SE/langmetadata.xml b/installation/language/sv-SE/langmetadata.xml
index fd0857795deec..a63cda1a04ef6 100644
--- a/installation/language/sv-SE/langmetadata.xml
+++ b/installation/language/sv-SE/langmetadata.xml
@@ -2,7 +2,7 @@
Swedish (Sweden)4.3.4
- 2023-07
+ 2023-08Swedish Translation Team - SvenskJoomla(C) 2005 Open Source Matters, Inc.GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/installation/language/ta-IN/langmetadata.xml b/installation/language/ta-IN/langmetadata.xml
index 3f0feb1408b87..e2b6922483c37 100644
--- a/installation/language/ta-IN/langmetadata.xml
+++ b/installation/language/ta-IN/langmetadata.xml
@@ -2,7 +2,7 @@
Tamil (India)4.3.4
- 2023-07
+ 2023-08Ilagnayeru 'MIG' Manickam, Elango Samy Manim(C) 2005 Open Source Matters, Inc.GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/installation/language/th-TH/langmetadata.xml b/installation/language/th-TH/langmetadata.xml
index 6b28041eb6f2c..77240511f6739 100644
--- a/installation/language/th-TH/langmetadata.xml
+++ b/installation/language/th-TH/langmetadata.xml
@@ -2,7 +2,7 @@
Thai (ภาษาไทย)4.3.4
- 2023-07
+ 2023-08Thai Translation Team(C) 2005 Open Source Matters, Inc.GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/installation/language/tr-TR/langmetadata.xml b/installation/language/tr-TR/langmetadata.xml
index c162933fcd142..e9fc4dea5d9d0 100644
--- a/installation/language/tr-TR/langmetadata.xml
+++ b/installation/language/tr-TR/langmetadata.xml
@@ -2,7 +2,7 @@
Turkish (Türkiye)4.3.4
- 2023-07
+ 2023-08Joomla! Türkiye(C) 2005 Open Source Matters, Inc.GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/installation/language/uk-UA/langmetadata.xml b/installation/language/uk-UA/langmetadata.xml
index 9946dea615ca2..995a6745c2083 100644
--- a/installation/language/uk-UA/langmetadata.xml
+++ b/installation/language/uk-UA/langmetadata.xml
@@ -2,7 +2,7 @@
Ukrainian (uk-UA)4.3.4
- 2023-07
+ 2023-08Joomla! Project - Ukrainian translation team(C) 2005 Open Source Matters, Inc.GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/installation/language/ur-PK/langmetadata.xml b/installation/language/ur-PK/langmetadata.xml
index fd46254372885..3bd41850a3952 100644
--- a/installation/language/ur-PK/langmetadata.xml
+++ b/installation/language/ur-PK/langmetadata.xml
@@ -2,7 +2,7 @@
4.3.4
- 2023-07
+ 2023-08(C) 2005 Open Source Matters, Inc.GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/installation/language/vi-VN/langmetadata.xml b/installation/language/vi-VN/langmetadata.xml
index 983f03652455a..6b53107528d55 100644
--- a/installation/language/vi-VN/langmetadata.xml
+++ b/installation/language/vi-VN/langmetadata.xml
@@ -2,7 +2,7 @@
Tiếng Việt (Việt Nam)4.3.4
- 2023-07
+ 2023-08Joomla! Project(C) 2005 Open Source Matters, Inc.GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/installation/language/zh-CN/langmetadata.xml b/installation/language/zh-CN/langmetadata.xml
index cc6c077ae7055..45f393de14b75 100644
--- a/installation/language/zh-CN/langmetadata.xml
+++ b/installation/language/zh-CN/langmetadata.xml
@@ -2,7 +2,7 @@
简体中文(中国)4.3.4
- 2023-07
+ 2023-08逐浪中文网 joomlachina.org.cn 周永建(C) 2005 Open Source Matters, Inc.GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/installation/language/zh-TW/langmetadata.xml b/installation/language/zh-TW/langmetadata.xml
index 6428a951d7cbf..53011f61b113e 100644
--- a/installation/language/zh-TW/langmetadata.xml
+++ b/installation/language/zh-TW/langmetadata.xml
@@ -2,7 +2,7 @@
正體中文 (臺灣)4.3.4
- 2023-07
+ 2023-08Joomla! 專案(C) 2005 Open Source Matters, Inc.GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/libraries/src/Application/ApiApplication.php b/libraries/src/Application/ApiApplication.php
index b0fd0b419a0c2..18061a720f118 100644
--- a/libraries/src/Application/ApiApplication.php
+++ b/libraries/src/Application/ApiApplication.php
@@ -13,8 +13,8 @@
use Joomla\CMS\Access\Exception\AuthenticationFailed;
use Joomla\CMS\Component\ComponentHelper;
use Joomla\CMS\Event\Application\AfterApiRouteEvent;
-use Joomla\CMS\Event\Application\AfterInitialiseDocumentEvent;
use Joomla\CMS\Event\Application\AfterDispatchEvent;
+use Joomla\CMS\Event\Application\AfterInitialiseDocumentEvent;
use Joomla\CMS\Event\Application\BeforeApiRouteEvent;
use Joomla\CMS\Factory;
use Joomla\CMS\Plugin\PluginHelper;
diff --git a/libraries/src/Client/FtpClient.php b/libraries/src/Client/FtpClient.php
index cede33eabd0b9..5adb2992b7906 100644
--- a/libraries/src/Client/FtpClient.php
+++ b/libraries/src/Client/FtpClient.php
@@ -208,7 +208,7 @@ public function __construct(array $options = [])
*/
public function __destruct()
{
- if (\is_resource($this->_conn)) {
+ if ($this->_conn) {
$this->quit();
}
}
@@ -293,7 +293,7 @@ public function connect($host = '127.0.0.1', $port = 21)
$err = null;
// If already connected, return
- if (\is_resource($this->_conn)) {
+ if ($this->_conn) {
return true;
}
@@ -301,7 +301,7 @@ public function connect($host = '127.0.0.1', $port = 21)
if (FTP_NATIVE) {
$this->_conn = @ftp_connect($host, $port, $this->_timeout);
- if ($this->_conn === false) {
+ if (!$this->_conn) {
Log::add(Text::sprintf('JLIB_CLIENT_ERROR_FTP_NO_CONNECT', __METHOD__, $host, $port), Log::WARNING, 'jerror');
return false;
@@ -323,7 +323,7 @@ public function connect($host = '127.0.0.1', $port = 21)
}
// Set the timeout for this connection
- socket_set_timeout($this->_conn, $this->_timeout, 0);
+ stream_set_timeout($this->_conn, $this->_timeout, 0);
// Check for welcome response code
if (!$this->_verifyResponse(220)) {
@@ -344,7 +344,7 @@ public function connect($host = '127.0.0.1', $port = 21)
*/
public function isConnected()
{
- return \is_resource($this->_conn);
+ return ($this->_conn);
}
/**
@@ -1580,7 +1580,7 @@ public function listDetails($path = null, $type = 'all')
protected function _putCmd($cmd, $expectedResponse)
{
// Make sure we have a connection to the server
- if (!\is_resource($this->_conn)) {
+ if (!$this->_conn) {
Log::add(Text::sprintf('JLIB_CLIENT_ERROR_FTP_PUTCMD_UNCONNECTED', __METHOD__), Log::WARNING, 'jerror');
return false;
@@ -1659,7 +1659,7 @@ protected function _passive()
$err = null;
// Make sure we have a connection to the server
- if (!\is_resource($this->_conn)) {
+ if (!$this->_conn) {
Log::add(Text::sprintf('JLIB_CLIENT_ERROR_FTP_NO_CONNECT', __METHOD__), Log::WARNING, 'jerror');
return false;
@@ -1718,7 +1718,7 @@ protected function _passive()
}
// Set the timeout for this connection
- socket_set_timeout($this->_conn, $this->_timeout, 0);
+ stream_set_timeout($this->_conn, $this->_timeout, 0);
return true;
}
diff --git a/libraries/src/Form/Rule/CssIdentifierRule.php b/libraries/src/Form/Rule/CssIdentifierRule.php
index 0b945b8a27431..d0da9d5128734 100644
--- a/libraries/src/Form/Rule/CssIdentifierRule.php
+++ b/libraries/src/Form/Rule/CssIdentifierRule.php
@@ -56,7 +56,7 @@ public function test(\SimpleXMLElement $element, $value, $group = null, Registry
* The following regex rules are based on the Html::cleanCssIdentifier method from Drupal
* https://github.com/drupal/drupal/blob/8.8.5/core/lib/Drupal/Component/Utility/Html.php#L116-L130
*
- * with the addition for Joomla that we allow the colon (U+003A).
+ * with the addition for Joomla that we allow the colon (U+003A) and the @ (U+0040).
*/
/**
@@ -66,10 +66,11 @@ public function test(\SimpleXMLElement $element, $value, $group = null, Registry
* - A-Z (U+0041 - U+005A)
* - the underscore (U+005F)
* - the colon (U+003A)
+ * - the @-sign (U+0040)
* - 0-9 (U+0061 - U+007A)
* - ISO 10646 characters U+00A1 and higher
*/
- if (preg_match('/[^\\x{002D}\\x{0030}-\\x{0039}\\x{0041}-\\x{005A}\\x{005F}\\x{003A}\\x{0061}-\\x{007A}\\x{00A1}-\\x{FFFF}]/u', $identifier)) {
+ if (preg_match('/[^\\x{002D}\\x{0030}-\\x{0039}\\x{0040}-\\x{005A}\\x{005F}\\x{003A}\\x{0061}-\\x{007A}\\x{00A1}-\\x{FFFF}]/u', $identifier)) {
return false;
}
diff --git a/libraries/src/Form/Rule/CssIdentifierSubstringRule.php b/libraries/src/Form/Rule/CssIdentifierSubstringRule.php
index 72749896b9e2b..8d8f6362f59f0 100644
--- a/libraries/src/Form/Rule/CssIdentifierSubstringRule.php
+++ b/libraries/src/Form/Rule/CssIdentifierSubstringRule.php
@@ -52,7 +52,7 @@ public function test(\SimpleXMLElement $element, $value, $group = null, Registry
* The following regex rules are based on the Html::cleanCssIdentifier method from Drupal
* https://github.com/drupal/drupal/blob/8.8.5/core/lib/Drupal/Component/Utility/Html.php#L116-L130
*
- * with the addition for Joomla that we allow the colon (U+003A).
+ * with the addition for Joomla that we allow the colon (U+003A) and the @ (U+0040).
*/
/**
@@ -62,6 +62,7 @@ public function test(\SimpleXMLElement $element, $value, $group = null, Registry
* - A-Z (U+0041 - U+005A)
* - the underscore (U+005F)
* - the colon (U+003A)
+ * - the @ sign (U+0040)
* - 0-9 (U+0061 - U+007A)
* - ISO 10646 characters U+00A1 and higher
*/
@@ -69,7 +70,7 @@ public function test(\SimpleXMLElement $element, $value, $group = null, Registry
$cssIdentifiers = explode(' ', $value);
foreach ($cssIdentifiers as $identifier) {
- if (preg_match('/[^\\x{002D}\\x{0030}-\\x{0039}\\x{0041}-\\x{005A}\\x{005F}\\x{003A}\\x{0061}-\\x{007A}\\x{00A1}-\\x{FFFF}]/u', $identifier)) {
+ if (preg_match('/[^\\x{002D}\\x{0030}-\\x{0039}\\x{0040}-\\x{005A}\\x{005F}\\x{003A}\\x{0061}-\\x{007A}\\x{00A1}-\\x{FFFF}]/u', $identifier)) {
return false;
}
}
diff --git a/libraries/src/MVC/Controller/BaseController.php b/libraries/src/MVC/Controller/BaseController.php
index 486746a47817d..e7807ee4972d9 100644
--- a/libraries/src/MVC/Controller/BaseController.php
+++ b/libraries/src/MVC/Controller/BaseController.php
@@ -1118,7 +1118,7 @@ protected function prepareViewModel(ViewInterface $view)
*
* @return DispatcherInterface
*
- * @since 5.0.0
+ * @since 4.4.0
* @throws \UnexpectedValueException May be thrown if the dispatcher has not been set.
*/
public function getDispatcher()
diff --git a/libraries/src/MVC/Model/BaseDatabaseModel.php b/libraries/src/MVC/Model/BaseDatabaseModel.php
index 7fb5127d5dea9..0209c6d7d701a 100644
--- a/libraries/src/MVC/Model/BaseDatabaseModel.php
+++ b/libraries/src/MVC/Model/BaseDatabaseModel.php
@@ -341,7 +341,7 @@ protected function bootComponent($component): ComponentInterface
*
* @return DispatcherInterface
*
- * @since 5.0.0
+ * @since 4.4.0
* @throws \UnexpectedValueException May be thrown if the dispatcher has not been set.
*/
public function getDispatcher()
diff --git a/libraries/src/MVC/View/AbstractView.php b/libraries/src/MVC/View/AbstractView.php
index 92d3dd1885a32..af8f3e85103cc 100644
--- a/libraries/src/MVC/View/AbstractView.php
+++ b/libraries/src/MVC/View/AbstractView.php
@@ -285,7 +285,7 @@ public function setDocument(Document $document): void
*
* @return DispatcherInterface
*
- * @since 5.0.0
+ * @since 4.4.0
* @throws \UnexpectedValueException May be thrown if the dispatcher has not been set.
*/
public function getDispatcher()
diff --git a/modules/mod_articles_category/src/Helper/ArticlesCategoryHelper.php b/modules/mod_articles_category/src/Helper/ArticlesCategoryHelper.php
index bb88c58be1861..593e6640f5dde 100644
--- a/modules/mod_articles_category/src/Helper/ArticlesCategoryHelper.php
+++ b/modules/mod_articles_category/src/Helper/ArticlesCategoryHelper.php
@@ -10,16 +10,16 @@
namespace Joomla\Module\ArticlesCategory\Site\Helper;
-use Joomla\Component\Content\Administrator\Extension\ContentComponent;
-use Joomla\Component\Content\Site\Helper\RouteHelper;
use Joomla\CMS\Access\Access;
use Joomla\CMS\Application\SiteApplication;
use Joomla\CMS\Component\ComponentHelper;
use Joomla\CMS\Date\Date;
use Joomla\CMS\Factory;
use Joomla\CMS\HTML\HTMLHelper;
-use Joomla\CMS\Router\Route;
use Joomla\CMS\Plugin\PluginHelper;
+use Joomla\CMS\Router\Route;
+use Joomla\Component\Content\Administrator\Extension\ContentComponent;
+use Joomla\Component\Content\Site\Helper\RouteHelper;
use Joomla\Database\DatabaseAwareInterface;
use Joomla\Database\DatabaseAwareTrait;
use Joomla\Registry\Registry;
diff --git a/tests/System/integration/api/com_privacy/Request.cy.js b/tests/System/integration/api/com_privacy/Request.cy.js
new file mode 100644
index 0000000000000..f9aec422b45d2
--- /dev/null
+++ b/tests/System/integration/api/com_privacy/Request.cy.js
@@ -0,0 +1,27 @@
+describe('Test privacy request API endpoint', () => {
+ afterEach(() => cy.task('queryDB', 'DELETE FROM #__privacy_requests'));
+
+ it('can get a list of requests', () => {
+ cy.db_createPrivacyRequest()
+ .then(() => cy.api_get('/privacy/requests'))
+ .then((response) => cy.api_responseContains(response, 'email', 'test@example.com'));
+ });
+
+ it('can list a single request', () => {
+ cy.db_createPrivacyRequest()
+ .then((id) => cy.api_get(`/privacy/requests/${id}`))
+ .then((response) => cy.wrap(response).its('body').its('data').its('attributes')
+ .its('status')
+ .should('equal', 0));
+ });
+
+ it('can create a request', () => {
+ cy.api_post('/privacy/requests ', {
+ email: 'test@example.com',
+ request_type: 'export',
+ })
+ .then((response) => cy.wrap(response).its('body').its('data').its('attributes')
+ .its('email')
+ .should('include', 'test@example.com'));
+ });
+});
diff --git a/tests/System/support/commands/db.js b/tests/System/support/commands/db.js
index d8e4ade09f707..acb5e1df344be 100644
--- a/tests/System/support/commands/db.js
+++ b/tests/System/support/commands/db.js
@@ -43,6 +43,25 @@ function createInsertQuery(table, values) {
return query;
}
+/**
+ * Creates a privacy request in the database with the given data.
+ * The privacy request contains some default values when not all required fields are passed in the given data.
+ * The id of the inserted privacy request is returned
+ *
+ * @param {Object} privacyRequest The tag data to insert
+ *
+ * @returns integer
+ */
+Cypress.Commands.add('db_createPrivacyRequest', (privacyRequest) => {
+ const defaultPrivacyRequestOptions = {
+ email: 'test@example.com',
+ requested_at: '2023-01-01 20:00:00',
+ status: '0',
+ };
+
+ return cy.task('queryDB', createInsertQuery('privacy_requests', { ...defaultPrivacyRequestOptions, ...privacyRequest })).then(async (info) => info.insertId);
+});
+
/**
* Creates an article in the database with the given data. The article contains some default values when
* not all required fields are passed in the given data. The id of the inserted article is returned.
diff --git a/tests/Unit/Libraries/Cms/Document/DocumentAwareTraitTest.php b/tests/Unit/Libraries/Cms/Document/DocumentAwareTraitTest.php
index 4bc9a582d169e..a41ada99319e0 100644
--- a/tests/Unit/Libraries/Cms/Document/DocumentAwareTraitTest.php
+++ b/tests/Unit/Libraries/Cms/Document/DocumentAwareTraitTest.php
@@ -10,8 +10,8 @@
namespace Joomla\Tests\Unit\Libraries\Cms\Document;
-use Joomla\CMS\Document\DocumentAwareTrait;
use Joomla\CMS\Document\Document;
+use Joomla\CMS\Document\DocumentAwareTrait;
use Joomla\Tests\Unit\UnitTestCase;
/**
diff --git a/tests/Unit/Libraries/Cms/Html/HtmlDateTest.php b/tests/Unit/Libraries/Cms/Html/HtmlDateTest.php
index 90b045dfcabfb..89b0eafb8791b 100644
--- a/tests/Unit/Libraries/Cms/Html/HtmlDateTest.php
+++ b/tests/Unit/Libraries/Cms/Html/HtmlDateTest.php
@@ -10,8 +10,8 @@
namespace Joomla\Tests\Unit\Libraries\Cms\Html;
-use Joomla\CMS\HTML\Helpers\Date as HtmlDate;
use Joomla\CMS\Date\Date;
+use Joomla\CMS\HTML\Helpers\Date as HtmlDate;
use Joomla\Tests\Unit\UnitTestCase;
/**
diff --git a/tests/Unit/Libraries/Cms/Language/LanguageAwareTraitTest.php b/tests/Unit/Libraries/Cms/Language/LanguageAwareTraitTest.php
index 5bd3800ec8d0d..379029c6b683b 100644
--- a/tests/Unit/Libraries/Cms/Language/LanguageAwareTraitTest.php
+++ b/tests/Unit/Libraries/Cms/Language/LanguageAwareTraitTest.php
@@ -10,8 +10,8 @@
namespace Joomla\Tests\Unit\Libraries\Cms\Language;
-use Joomla\CMS\Language\LanguageAwareTrait;
use Joomla\CMS\Language\Language;
+use Joomla\CMS\Language\LanguageAwareTrait;
use Joomla\Tests\Unit\UnitTestCase;
/**
diff --git a/tests/Unit/Libraries/Cms/User/UserFactoryAwareTraitTest.php b/tests/Unit/Libraries/Cms/User/UserFactoryAwareTraitTest.php
index d28e1aa031019..83cd5f983ca57 100644
--- a/tests/Unit/Libraries/Cms/User/UserFactoryAwareTraitTest.php
+++ b/tests/Unit/Libraries/Cms/User/UserFactoryAwareTraitTest.php
@@ -10,8 +10,8 @@
namespace Joomla\Tests\Unit\Libraries\Cms\User;
-use Joomla\CMS\User\UserFactoryAwareTrait;
use Joomla\CMS\User\User;
+use Joomla\CMS\User\UserFactoryAwareTrait;
use Joomla\CMS\User\UserFactoryInterface;
use Joomla\Tests\Unit\UnitTestCase;
```
PR w związku ze zmianą oryginału https://github.com/joomla/joomla-cms/pull/41505 Poniżej zmiany w oryginale:
Click to expand the diff!
```diff diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php index 1d93159ad7e7b..4c6103b5b360e 100644 --- a/.php-cs-fixer.dist.php +++ b/.php-cs-fixer.dist.php @@ -82,6 +82,8 @@ 'no_unused_imports' => true, // Classes from the global namespace should not be imported 'global_namespace_import' => ['import_classes' => false, 'import_constants' => false, 'import_functions' => false], + // Alpha order imports + 'ordered_imports' => ['imports_order' => ['class', 'function', 'const'], 'sort_algorithm' => 'alpha'], ] ) ->setFinder($finder); diff --git a/administrator/components/com_categories/src/Model/CategoriesModel.php b/administrator/components/com_categories/src/Model/CategoriesModel.php index d144471c31873..48d0e3e0a091a 100644 --- a/administrator/components/com_categories/src/Model/CategoriesModel.php +++ b/administrator/components/com_categories/src/Model/CategoriesModel.php @@ -174,7 +174,7 @@ protected function getListQuery() 'a.id, a.title, a.alias, a.note, a.published, a.access' . ', a.checked_out, a.checked_out_time, a.created_user_id' . ', a.path, a.parent_id, a.level, a.lft, a.rgt' . - ', a.language' + ', a.language, a.description' ) ); $query->from($db->quoteName('#__categories', 'a')); diff --git a/administrator/components/com_fields/src/Helper/FieldsHelper.php b/administrator/components/com_fields/src/Helper/FieldsHelper.php index f6afbd77637f5..fc3b430564eba 100644 --- a/administrator/components/com_fields/src/Helper/FieldsHelper.php +++ b/administrator/components/com_fields/src/Helper/FieldsHelper.php @@ -18,8 +18,8 @@ use Joomla\CMS\Layout\LayoutHelper; use Joomla\CMS\Object\CMSObject; use Joomla\CMS\Plugin\PluginHelper; -use Joomla\Component\Fields\Administrator\Model\FieldsModel; use Joomla\Component\Fields\Administrator\Model\FieldModel; +use Joomla\Component\Fields\Administrator\Model\FieldsModel; use Joomla\Database\ParameterType; // phpcs:disable PSR1.Files.SideEffects diff --git a/administrator/components/com_guidedtours/src/View/Steps/HtmlView.php b/administrator/components/com_guidedtours/src/View/Steps/HtmlView.php index 9deed99012dc7..abf3b07aede2a 100644 --- a/administrator/components/com_guidedtours/src/View/Steps/HtmlView.php +++ b/administrator/components/com_guidedtours/src/View/Steps/HtmlView.php @@ -15,9 +15,9 @@ use Joomla\CMS\Language\Text; use Joomla\CMS\MVC\View\GenericDataException; use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView; +use Joomla\CMS\Router\Route; use Joomla\CMS\Toolbar\Toolbar; use Joomla\CMS\Toolbar\ToolbarHelper; -use Joomla\CMS\Router\Route; // phpcs:disable PSR1.Files.SideEffects \defined('_JEXEC') or die; diff --git a/administrator/components/com_installer/src/Model/ManageModel.php b/administrator/components/com_installer/src/Model/ManageModel.php index 4520c9f4ea20a..d6a5932d8ec6c 100644 --- a/administrator/components/com_installer/src/Model/ManageModel.php +++ b/administrator/components/com_installer/src/Model/ManageModel.php @@ -56,6 +56,7 @@ public function __construct($config = [], MVCFactoryInterface $factory = null) 'package_id', 'extension_id', 'creationDate', + 'core', ]; } diff --git a/administrator/components/com_languages/src/Controller/InstalledController.php b/administrator/components/com_languages/src/Controller/InstalledController.php index 421f787394356..d92d01a8d93af 100644 --- a/administrator/components/com_languages/src/Controller/InstalledController.php +++ b/administrator/components/com_languages/src/Controller/InstalledController.php @@ -11,8 +11,8 @@ namespace Joomla\Component\Languages\Administrator\Controller; use Joomla\CMS\Factory; -use Joomla\CMS\Language\LanguageHelper; use Joomla\CMS\Language\Language; +use Joomla\CMS\Language\LanguageHelper; use Joomla\CMS\Language\Multilanguage; use Joomla\CMS\Language\Text; use Joomla\CMS\MVC\Controller\BaseController; diff --git a/api/components/com_categories/src/View/Categories/JsonapiView.php b/api/components/com_categories/src/View/Categories/JsonapiView.php index 25a63ba4b14a7..360a5ba3f03a2 100644 --- a/api/components/com_categories/src/View/Categories/JsonapiView.php +++ b/api/components/com_categories/src/View/Categories/JsonapiView.php @@ -57,6 +57,7 @@ class JsonapiView extends BaseApiView 'count_published', 'count_archived', 'params', + 'description', ]; /** @@ -90,6 +91,7 @@ class JsonapiView extends BaseApiView 'count_published', 'count_archived', 'params', + 'description', ]; /** diff --git a/components/com_contact/src/Model/ContactModel.php b/components/com_contact/src/Model/ContactModel.php index 817cb03436be5..3d8366042633a 100644 --- a/components/com_contact/src/Model/ContactModel.php +++ b/components/com_contact/src/Model/ContactModel.php @@ -331,7 +331,7 @@ protected function buildContactExtendedData($contact) // Filter per language if plugin published if (Multilanguage::isEnabled()) { - $language = [Factory::getLanguage()->getTag(), $db->quote('*')]; + $language = [Factory::getLanguage()->getTag(), '*']; $query->whereIn($db->quoteName('a.language'), $language, ParameterType::STRING); } diff --git a/installation/language/af-ZA/langmetadata.xml b/installation/language/af-ZA/langmetadata.xml index fdfab17fc6d6a..9fc30270d9567 100644 --- a/installation/language/af-ZA/langmetadata.xml +++ b/installation/language/af-ZA/langmetadata.xml @@ -2,7 +2,7 @@