Skip to content

Commit 6f13e9c

Browse files
committed
Merge branch '6.0-dev' into 6.1/maint/upmerge-251106
2 parents 1cd31e4 + 1cb2b4b commit 6f13e9c

File tree

140 files changed

+834
-724
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

140 files changed

+834
-724
lines changed

.github/workflows/create-translation-pull-request-v5.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ jobs:
3131
with:
3232
ref: translation5
3333
fetch-depth: 0
34+
token: ${{ secrets.PAT_WORKFLOW }}
3435
- uses: actions/setup-node@v5
3536
with:
3637
node-version: 24

.github/workflows/create-translation-pull-request-v6.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ jobs:
3131
with:
3232
ref: translation6
3333
fetch-depth: 0
34+
token: ${{ secrets.PAT_WORKFLOW }}
3435
- uses: actions/setup-node@v5
3536
with:
3637
node-version: 24

administrator/components/com_banners/helpers/banners.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
*
2020
* @since 1.6
2121
*
22-
* @deprecated 4.3 will be removed in 6.0
22+
* @deprecated 4.3 will be removed in 7.0
2323
* Use \Joomla\Component\Banners\Administrator\Helper\BannersHelper instead
2424
*/
2525
class BannersHelper extends \Joomla\Component\Banners\Administrator\Helper\BannersHelper

administrator/components/com_categories/helpers/categories.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
*
2020
* @since 1.6
2121
*
22-
* @deprecated 4.3 will be removed in 6.0
22+
* @deprecated 4.3 will be removed in 7.0
2323
* Use \Joomla\Component\Categories\Administrator\Helper\CategoriesHelper instead
2424
*/
2525
class CategoriesHelper extends \Joomla\Component\Categories\Administrator\Helper\CategoriesHelper

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1231,6 +1231,7 @@ protected function cleanCache($group = null)
12311231
switch ($extension) {
12321232
case 'com_content':
12331233
parent::cleanCache('com_content');
1234+
parent::cleanCache('mod_articles');
12341235
parent::cleanCache('mod_articles_archive');
12351236
parent::cleanCache('mod_articles_categories');
12361237
parent::cleanCache('mod_articles_category');

administrator/components/com_contact/helpers/contact.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
*
2020
* @since 1.6
2121
*
22-
* @deprecated 4.3 will be removed in 6.0
22+
* @deprecated 4.3 will be removed in 7.0
2323
* Use \Joomla\Component\Contact\Administrator\Helper\ContactHelper instead
2424
*/
2525
class ContactHelper extends \Joomla\Component\Contact\Administrator\Helper\ContactHelper

administrator/components/com_content/helpers/content.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
*
2020
* @since 1.6
2121
*
22-
* @deprecated 4.3 will be removed in 6.0
22+
* @deprecated 4.3 will be removed in 7.0
2323
* Use \Joomla\Component\Content\Administrator\Helper\ContentHelper instead
2424
*/
2525
class ContentHelper extends \Joomla\Component\Content\Administrator\Helper\ContentHelper

administrator/components/com_content/src/Model/ArticleModel.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1059,6 +1059,7 @@ protected function preprocessForm(Form $form, $data, $group = 'content')
10591059
protected function cleanCache($group = null)
10601060
{
10611061
parent::cleanCache('com_content');
1062+
parent::cleanCache('mod_articles');
10621063
parent::cleanCache('mod_articles_archive');
10631064
parent::cleanCache('mod_articles_categories');
10641065
parent::cleanCache('mod_articles_category');

administrator/components/com_contenthistory/helpers/contenthistory.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
*
2020
* @since 3.2
2121
*
22-
* @deprecated 4.3 will be removed in 6.0
22+
* @deprecated 4.3 will be removed in 7.0
2323
* Use \Joomla\Component\Contenthistory\Administrator\Helper\ContenthistoryHelper instead
2424
*/
2525
class ContenthistoryHelper extends \Joomla\Component\Contenthistory\Administrator\Helper\ContenthistoryHelper

administrator/components/com_fields/helpers/fields.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
*
2020
* @since 3.7.0
2121
*
22-
* @deprecated 4.3 will be removed in 6.0
22+
* @deprecated 4.3 will be removed in 7.0
2323
* Use \Joomla\Component\Fields\Administrator\Helper\FieldsHelper instead
2424
*/
2525
class FieldsHelper extends \Joomla\Component\Fields\Administrator\Helper\FieldsHelper

0 commit comments

Comments
 (0)