Skip to content

Commit 05e3b87

Browse files
YatharthVyasYatharthVyas
authored
Merge branch '4.1-dev' into feature-module-workflow
2 parents 4348942 + f625ba4 commit 05e3b87

File tree

289 files changed

+4050
-1324
lines changed

Some content is hidden

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

289 files changed

+4050
-1324
lines changed

‎.github/CODEOWNERS‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,3 +66,14 @@ libraries/src/MVC/Model/Workflow* @bembelimen @hleithner
6666
libraries/src/Workflow/* @bembelimen @hleithner
6767
build/media_source/com_workflow/* @bembelimen @hleithner
6868
plugins/workflow/* @bembelimen @hleithner
69+
70+
# Joomla! Accessibility Team
71+
administrator/*/components/*/tmpl/* @chmst
72+
administrator/*/modules/*/tmpl/* @chmst
73+
administrator/templates/atum/* @chmst
74+
components/*/tmpl/* @chmst
75+
modules/*/tmpl/* @chmst
76+
plugins/*/tmpl/* @chmst
77+
templates/cassiopeia/* @chmst
78+
layouts/* @chmst
79+
installation/tmpl/* @chmst

‎.github/workflows/create-translation-pull-request-v4.yml‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@ jobs:
2121
# We need the full depth to create / update the pull request against the main repo
2222
with:
2323
fetch-depth: 0
24+
- uses: actions/setup-node@v1
25+
with:
26+
node-version: 12
2427

2528
- name: Fetch latest cms changes
2629
run: |
@@ -29,7 +32,7 @@ jobs:
2932
git remote add upstream https://github.com/joomla/joomla-cms.git
3033
git fetch upstream
3134
git checkout --progress --force -B translation refs/remotes/origin/translation
32-
git rebase upstream/4.0-dev
35+
git merge upstream/4.0-dev
3336
3437
- name: Fetch and extract translations
3538
run: |
@@ -47,6 +50,10 @@ jobs:
4750
echo ${SYNC_PATH}
4851
rsync -i -rptgo --checksum --ignore-times --delete --exclude="*en-GB*" core-translations-main/joomla_${SYNC_VERION}/translations/core/${SYNC_PATH} joomla-cms/${SYNC_PATH}
4952
53+
- name: Update static error pages
54+
run: |
55+
npm ci --ignore-scripts && node build/build.js --build-pages
56+
5057
- name: Create commit
5158
run: |
5259
git config user.name Translation Bot
@@ -60,4 +67,4 @@ jobs:
6067
GITHUB_TOKEN: ${{ secrets.API_TOKEN_GITHUB }}
6168
run: |
6269
gh pr list -R joomla/joomla-cms --state open --author joomla-translation-bot -S "Translation Update" | grep -v "No pull" || \
63-
gh pr create --title "Translation Update" --body "Automatically created pull request based on core-translation repository changes" -R joomla/joomla-cms --base 4.0-dev
70+
gh pr create --title "Translation Update" --body "Automatically created pull request based on core-translation repository changes" -R joomla/joomla-cms --base 4.0-dev

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Joomla! CMS™ [![Analytics](https://ga-beacon.appspot.com/UA-544070-3/joomla-cms/readme)](https://github.com/igrigorik/ga-beacon)
1+
Joomla! CMS™
22
====================
33

44
Build Status

‎administrator/components/com_admin/script.php‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -947,6 +947,7 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)
947947
'/administrator/components/com_admin/sql/updates/sqlazure/3.1.4.sql',
948948
'/administrator/components/com_admin/sql/updates/sqlazure/3.1.5.sql',
949949
'/administrator/components/com_admin/sql/updates/sqlazure/3.10.0-2021-05-28.sql',
950+
'/administrator/components/com_admin/sql/updates/sqlazure/3.10.1-2021-08-17.sql',
950951
'/administrator/components/com_admin/sql/updates/sqlazure/3.2.0.sql',
951952
'/administrator/components/com_admin/sql/updates/sqlazure/3.2.1.sql',
952953
'/administrator/components/com_admin/sql/updates/sqlazure/3.2.2-2013-12-22.sql',
@@ -6088,6 +6089,15 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)
60886089
'/libraries/vendor/willdurand/negotiation/tests/Negotiation/Tests/NegotiatorTest.php',
60896090
'/libraries/vendor/willdurand/negotiation/tests/Negotiation/Tests/TestCase.php',
60906091
'/libraries/vendor/willdurand/negotiation/tests/bootstrap.php',
6092+
// From 4.0.2 to 4.0.3
6093+
'/templates/cassiopeia/css/global/fonts-web_fira-sans.css',
6094+
'/templates/cassiopeia/css/global/fonts-web_fira-sans.min.css',
6095+
'/templates/cassiopeia/css/global/fonts-web_fira-sans.min.css.gz',
6096+
'/templates/cassiopeia/css/global/fonts-web_roboto+noto-sans.css',
6097+
'/templates/cassiopeia/css/global/fonts-web_roboto+noto-sans.min.css',
6098+
'/templates/cassiopeia/css/global/fonts-web_roboto+noto-sans.min.css.gz',
6099+
'/templates/cassiopeia/scss/global/fonts-web_fira-sans.scss',
6100+
'/templates/cassiopeia/scss/global/fonts-web_roboto+noto-sans.scss',
60916101
);
60926102

60936103
$folders = array(
@@ -8160,8 +8170,8 @@ protected function fixFilenameCasing()
81608170
if ($newBasename !== $expectedBasename)
81618171
{
81628172
// Rename the file.
8163-
rename(JPATH_ROOT . $old, JPATH_ROOT . $old . '.tmp');
8164-
rename(JPATH_ROOT . $old . '.tmp', JPATH_ROOT . $expected);
8173+
File::move(JPATH_ROOT . $old, JPATH_ROOT . $old . '.tmp');
8174+
File::move(JPATH_ROOT . $old . '.tmp', JPATH_ROOT . $expected);
81658175

81668176
continue;
81678177
}
@@ -8176,14 +8186,14 @@ protected function fixFilenameCasing()
81768186
if (!in_array($expectedBasename, scandir(dirname($newRealpath))))
81778187
{
81788188
// Rename the file.
8179-
rename(JPATH_ROOT . $old, JPATH_ROOT . $old . '.tmp');
8180-
rename(JPATH_ROOT . $old . '.tmp', JPATH_ROOT . $expected);
8189+
File::move(JPATH_ROOT . $old, JPATH_ROOT . $old . '.tmp');
8190+
File::move(JPATH_ROOT . $old . '.tmp', JPATH_ROOT . $expected);
81818191
}
81828192
}
81838193
else
81848194
{
81858195
// On Unix with both files: Delete the incorrectly cased file.
8186-
unlink(JPATH_ROOT . $old);
8196+
File::delete(JPATH_ROOT . $old);
81878197
}
81888198
}
81898199
}

‎administrator/components/com_admin/sql/updates/mysql/4.0.3-2021-09-04.sql‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
--
2+
-- Delete the com_search package extension including its update site if no other
3+
-- com_search extension exists
4+
--
5+
DELETE FROM `#__update_sites_extensions`
6+
WHERE `update_site_id` IN (SELECT `update_site_id` FROM `#__update_sites` WHERE `location` = 'https://raw.githubusercontent.com/joomla-extensions/search/main/manifest.xml')
7+
AND `extension_id` IN (SELECT `extension_id` FROM `#__extensions` WHERE `element` = 'pkg_search' AND `type` = 'package')
8+
AND (SELECT COUNT(a.`extension_id`)
9+
FROM `#__extensions` a
10+
WHERE (a.`type` = 'component' AND a.`element` = 'com_search')
11+
OR (a.`type` = 'module' AND a.`element` = 'mod_search' AND a.`client_id` = 0)
12+
OR (a.`type` = 'plugin' AND a.`element` IN ('categories', 'contacts', 'content', 'newsfeeds', 'tags') AND a.`folder` = 'search')
13+
) = 0;
14+
15+
DELETE FROM `#__update_sites`
16+
WHERE `location` = 'https://raw.githubusercontent.com/joomla-extensions/search/main/manifest.xml'
17+
AND (SELECT COUNT(a.`extension_id`)
18+
FROM `#__extensions` a
19+
WHERE (a.`type` = 'component' AND a.`element` = 'com_search')
20+
OR (a.`type` = 'module' AND a.`element` = 'mod_search' AND a.`client_id` = 0)
21+
OR (a.`type` = 'plugin' AND a.`element` IN ('categories', 'contacts', 'content', 'newsfeeds', 'tags') AND a.`folder` = 'search')
22+
) = 0;
23+
24+
DELETE FROM `#__extensions`
25+
WHERE `type` = 'package' AND `element` = 'pkg_search'
26+
AND (SELECT b.`count`
27+
FROM (SELECT COUNT(a.`extension_id`) AS `count`
28+
FROM `#__extensions` a
29+
WHERE (a.`type` = 'component' AND a.`element` = 'com_search')
30+
OR (a.`type` = 'module' AND a.`element` = 'mod_search' AND a.`client_id` = 0)
31+
OR (a.`type` = 'plugin' AND a.`element` IN ('categories', 'contacts', 'content', 'newsfeeds', 'tags') AND a.`folder` = 'search')
32+
) b
33+
) = 0;

‎administrator/components/com_admin/sql/updates/mysql/4.0.3-2021-09-05.sql‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
UPDATE `#__workflow_transitions` SET `title` = 'PUBLISH' WHERE `title`= 'Publish';
2+
UPDATE `#__workflow_transitions` SET `title` = 'UNPUBLISH' WHERE `title`= 'Unpublish';
3+
UPDATE `#__workflow_transitions` SET `title` = 'TRASH' WHERE `title`= 'Trash';
4+
UPDATE `#__workflow_transitions` SET `title` = 'ARCHIVE' WHERE `title`= 'Archive';
5+
UPDATE `#__workflow_transitions` SET `title` = 'FEATURE' WHERE `title`= 'Feature';
6+
UPDATE `#__workflow_transitions` SET `title` = 'UNFEATURE' WHERE `title`= 'Unfeature';
7+
UPDATE `#__workflow_transitions` SET `title` = 'PUBLISH_AND_FEATURE' WHERE `title`= 'Publish & Feature';

‎administrator/components/com_admin/sql/updates/postgresql/4.0.3-2021-09-04.sql‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
--
2+
-- Delete the com_search package extension including its update site if no other
3+
-- com_search extension exists
4+
--
5+
DELETE FROM "#__update_sites_extensions"
6+
WHERE "update_site_id" IN (SELECT "update_site_id" FROM "#__update_sites" WHERE "location" = 'https://raw.githubusercontent.com/joomla-extensions/search/main/manifest.xml')
7+
AND "extension_id" IN (SELECT "extension_id" FROM "#__extensions" WHERE "element" = 'pkg_search' AND "type" = 'package')
8+
AND (SELECT COUNT(a."extension_id")
9+
FROM "#__extensions" a
10+
WHERE (a."type" = 'component' AND a."element" = 'com_search')
11+
OR (a."type" = 'module' AND a."element" = 'mod_search' AND a."client_id" = 0)
12+
OR (a."type" = 'plugin' AND a."element" IN ('categories', 'contacts', 'content', 'newsfeeds', 'tags') AND a."folder" = 'search')
13+
) = 0;
14+
15+
DELETE FROM "#__update_sites"
16+
WHERE "location" = 'https://raw.githubusercontent.com/joomla-extensions/search/main/manifest.xml'
17+
AND (SELECT COUNT(a."extension_id")
18+
FROM "#__extensions" a
19+
WHERE (a."type" = 'component' AND a."element" = 'com_search')
20+
OR (a."type" = 'module' AND a."element" = 'mod_search' AND a."client_id" = 0)
21+
OR (a."type" = 'plugin' AND a."element" IN ('categories', 'contacts', 'content', 'newsfeeds', 'tags') AND a."folder" = 'search')
22+
) = 0;
23+
24+
DELETE FROM "#__extensions"
25+
WHERE "type" = 'package' AND "element" = 'pkg_search'
26+
AND (SELECT b."count"
27+
FROM (SELECT COUNT(a."extension_id") AS "count"
28+
FROM "#__extensions" a
29+
WHERE (a."type" = 'component' AND a."element" = 'com_search')
30+
OR (a."type" = 'module' AND a."element" = 'mod_search' AND a."client_id" = 0)
31+
OR (a."type" = 'plugin' AND a."element" IN ('categories', 'contacts', 'content', 'newsfeeds', 'tags') AND a."folder" = 'search')
32+
) b
33+
) = 0;

‎administrator/components/com_admin/sql/updates/postgresql/4.0.3-2021-09-05.sql‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
UPDATE "#__workflow_transitions" SET "title" = 'PUBLISH' WHERE "title"= 'Publish';
2+
UPDATE "#__workflow_transitions" SET "title" = 'UNPUBLISH' WHERE "title"= 'Unpublish';
3+
UPDATE "#__workflow_transitions" SET "title" = 'TRASH' WHERE "title"= 'Trash';
4+
UPDATE "#__workflow_transitions" SET "title" = 'ARCHIVE' WHERE "title"= 'Archive';
5+
UPDATE "#__workflow_transitions" SET "title" = 'FEATURE' WHERE "title"= 'Feature';
6+
UPDATE "#__workflow_transitions" SET "title" = 'UNFEATURE' WHERE "title"= 'Unfeature';
7+
UPDATE "#__workflow_transitions" SET "title" = 'PUBLISH_AND_FEATURE' WHERE "title"= 'Publish & Feature';

‎administrator/components/com_config/src/Model/ApplicationModel.php‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -956,12 +956,6 @@ private function writeConfigFile(Registry $config)
956956
throw new \RuntimeException(Text::_('COM_CONFIG_ERROR_WRITE_FAILED'));
957957
}
958958

959-
// Invalidates the cached configuration file
960-
if (function_exists('opcache_invalidate'))
961-
{
962-
\opcache_invalidate($file);
963-
}
964-
965959
// Attempt to make the file unwriteable.
966960
if (Path::isOwner($file) && !Path::setPermissions($file, '0444'))
967961
{

‎administrator/components/com_content/config.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,6 @@
297297
label="JGLOBAL_SHOW_HITS_LABEL"
298298
layout="joomla.form.field.radio.switcher"
299299
default="1"
300-
showon="record_hits:1"
301300
>
302301
<option value="0">JHIDE</option>
303302
<option value="1">JSHOW</option>

0 commit comments

Comments
 (0)