Skip to content

Commit dc9b9b9

Browse files
bembelimenbembelimen
committed
Merge branch '4.0-dev' of github.com:joomla/joomla-cms into 4.1-dev
# Conflicts: # libraries/src/Version.php
2 parents 1ad0aac + f105b6c commit dc9b9b9

File tree

152 files changed

+1701
-1865
lines changed

Some content is hidden

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

152 files changed

+1701
-1865
lines changed

‎README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@ Joomla is not installable out of the box from this repository, please use:
2828

2929
How to get a working installation from the source
3030
---------------------
31-
For detailed instructions please visit https://docs.joomla.org/J4.x:Setting_Up_Your_Local_Environment
31+
For detailed instructions please visit https://docs.joomla.org/Special:MyLanguage/J4.x:Setting_Up_Your_Local_Environment
3232

3333
You will need:
34-
- PHP - basically the same as you need for running a Joomla Site, but you need the cli (command line interface) Version (see https://docs.joomla.org/Configuring_a_LAMPP_server_for_PHP_development)
34+
- PHP - basically the same as you need for running a Joomla Site, but you need the cli (command line interface) Version (see https://docs.joomla.org/Special:MyLanguage/Configuring_a_LAMPP_server_for_PHP_development)
3535
- Composer - for managing Joomla's PHP Dependencies. For help installing composer please read the documentation at https://getcomposer.org/doc/00-intro.md
3636
- Node.js - for compiling Joomla's Javascript and SASS files. For help installing Node.js please follow the instructions available on https://nodejs.org/en/
37-
- Git - for version management. Download from here https://git-scm.com/downloads (MacOS users can also use Brew and Linux users can use the built-in package manager, eg apt, yum, etc).
37+
- Git - for version management. Download from here https://git-scm.com/downloads (MacOS users can also use Brew and Linux users can use the built-in package manager, eg apt, yum, etc).
3838

3939
**Steps to setup the local environment:**
4040
- Clone the repository:

‎administrator/components/com_admin/script.php‎

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1395,6 +1395,14 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)
13951395
'/administrator/components/com_joomlaupdate/helpers/select.php',
13961396
'/administrator/components/com_joomlaupdate/joomlaupdate.php',
13971397
'/administrator/components/com_joomlaupdate/models/default.php',
1398+
'/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default.php',
1399+
'/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_nodownload.php',
1400+
'/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_noupdate.php',
1401+
'/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_preupdatecheck.php',
1402+
'/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_reinstall.php',
1403+
'/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_update.php',
1404+
'/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_updatemefirst.php',
1405+
'/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_upload.php',
13981406
'/administrator/components/com_joomlaupdate/views/default/tmpl/complete.php',
13991407
'/administrator/components/com_joomlaupdate/views/default/tmpl/default.php',
14001408
'/administrator/components/com_joomlaupdate/views/default/tmpl/default.xml',
@@ -2854,6 +2862,7 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)
28542862
'/components/com_contact/helpers/association.php',
28552863
'/components/com_contact/helpers/category.php',
28562864
'/components/com_contact/helpers/legacyrouter.php',
2865+
'/components/com_contact/layouts/joomla/form/renderfield.php',
28572866
'/components/com_contact/models/categories.php',
28582867
'/components/com_contact/models/category.php',
28592868
'/components/com_contact/models/contact.php',
@@ -3800,6 +3809,7 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)
38003809
'/libraries/src/Form/FormWrapper.php',
38013810
'/libraries/src/Helper/ContentHistoryHelper.php',
38023811
'/libraries/src/Helper/SearchHelper.php',
3812+
'/libraries/src/Http/Transport/cacert.pem',
38033813
'/libraries/src/Http/Wrapper/FactoryWrapper.php',
38043814
'/libraries/src/Language/LanguageStemmer.php',
38053815
'/libraries/src/Language/Stemmer/Porteren.php',
@@ -5860,9 +5870,16 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)
58605870
'/media/com_fields/js/admin-field-edit-modal.min.js',
58615871
'/media/com_fields/js/admin-field-edit-modal.min.js.gz',
58625872
// 4.0 from RC 3 to RC 4
5863-
'/components/com_contact/layouts/joomla/form/renderfield.php',
58645873
'/language/en-GB/com_messages.ini',
5865-
'/libraries/src/Http/Transport/cacert.pem',
5874+
'/media/system/css/fields/joomla-image-select.css',
5875+
'/media/system/css/fields/joomla-image-select.min.css',
5876+
'/media/system/css/fields/joomla-image-select.min.css.gz',
5877+
'/media/system/js/fields/joomla-image-select-es5.js',
5878+
'/media/system/js/fields/joomla-image-select-es5.min.js',
5879+
'/media/system/js/fields/joomla-image-select-es5.min.js.gz',
5880+
'/media/system/js/fields/joomla-image-select.js',
5881+
'/media/system/js/fields/joomla-image-select.min.js',
5882+
'/media/system/js/fields/joomla-image-select.min.js.gz',
58665883
);
58675884

58685885
$folders = array(
@@ -6460,6 +6477,8 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)
64606477
'/components/com_contact/models/rules',
64616478
'/components/com_contact/models/forms',
64626479
'/components/com_contact/models',
6480+
'/components/com_contact/layouts/joomla/form',
6481+
'/components/com_contact/layouts/joomla',
64636482
'/components/com_contact/controllers',
64646483
'/components/com_config/view/templates/tmpl',
64656484
'/components/com_config/view/templates',
@@ -7054,7 +7073,7 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)
70547073
'/libraries/vendor/joomla/controller',
70557074
'/api/components/com_installer/src/View/Languages',
70567075
'/administrator/components/com_finder/src/Indexer/Driver',
7057-
// 4.0 from Beta 2 to Beta 5
7076+
// 4.0 from Beta 4 to Beta 5
70587077
'/plugins/content/imagelazyload',
70597078
// 4.0 from Beta 5 to Beta 6
70607079
'/media/system/js/core.es6',

‎administrator/components/com_admin/sql/updates/mysql/4.0.0-2018-03-05.sql‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ INSERT INTO `#__extensions` (`name`, `type`, `element`, `folder`, `client_id`, `
2020
('cassiopeia', 'template', 'cassiopeia', '', 0, 1, 1, 0, '{}', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0);
2121

2222
INSERT INTO `#__template_styles` (`template`, `client_id`, `home`, `title`, `params`) VALUES
23-
('atum', 1, (CASE WHEN (SELECT count FROM (SELECT count(`id`) AS count FROM `#__template_styles` WHERE home = '1' AND client_id = 1 AND `template` IN ('isis', 'hathor')) as c) = 0 THEN '0' ELSE '1' END), 'atum - Default', '{}'),
24-
('cassiopeia', 0, (CASE WHEN (SELECT count FROM (SELECT count(`id`) AS count FROM `#__template_styles` WHERE home = '1' AND client_id = 0 AND `template` IN ('protostar', 'beez3')) as c) = 0 THEN '0' ELSE '1' END), 'cassiopeia - Default', '{}');
23+
('atum', 1, (CASE WHEN (SELECT b.`count` FROM (SELECT count(a.`id`) AS `count` FROM `#__template_styles` a WHERE a.`home` = '1' AND a.`client_id` = 1 AND a.`template` IN ('isis', 'hathor')) AS b) = 0 THEN '0' ELSE '1' END), 'atum - Default', '{}'),
24+
('cassiopeia', 0, (CASE WHEN (SELECT d.`count` FROM (SELECT count(c.`id`) AS `count` FROM `#__template_styles` c WHERE c.`home` = '1' AND c.`client_id` = 0 AND c.`template` IN ('protostar', 'beez3')) AS d) = 0 THEN '0' ELSE '1' END), 'cassiopeia - Default', '{}');
2525

2626
--
2727
-- Move mod_version to the right position for the atum template

‎administrator/components/com_admin/sql/updates/postgresql/4.0.0-2018-03-05.sql‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ INSERT INTO "#__extensions" ("name", "type", "element", "folder", "client_id", "
2020
('cassiopeia', 'template', 'cassiopeia', '', 0, 1, 1, 0, '{}', '{}', '', '', 0, '1970-01-01 00:00:00', 0, 0);
2121

2222
INSERT INTO "#__template_styles" ("template", "client_id", "home", "title", "params") VALUES
23-
('atum', 1, (CASE WHEN (SELECT count FROM (SELECT count("id") AS count FROM "#__template_styles" WHERE home = '1' AND client_id = 1 AND "template" IN ('isis', 'hathor')) as c) = 0 THEN '0' ELSE '1' END), 'atum - Default', '{}'),
24-
('cassiopeia', 0, (CASE WHEN (SELECT count FROM (SELECT count("id") AS count FROM "#__template_styles" WHERE home = '1' AND client_id = 0 AND "template" IN ('protostar', 'beez3')) as c) = 0 THEN '0' ELSE '1' END), 'cassiopeia - Default', '{}');
23+
('atum', 1, (CASE WHEN (SELECT b."count" FROM (SELECT count(a."id") AS "count" FROM "#__template_styles" a WHERE a."home" = '1' AND a."client_id" = 1 AND a."template" IN ('isis', 'hathor')) AS b) = 0 THEN '0' ELSE '1' END), 'atum - Default', '{}'),
24+
('cassiopeia', 0, (CASE WHEN (SELECT d."count" FROM (SELECT count(c."id") AS "count" FROM "#__template_styles" c WHERE c."home" = '1' AND c."client_id" = 0 AND c."template" IN ('protostar', 'beez3')) AS d) = 0 THEN '0' ELSE '1' END), 'cassiopeia - Default', '{}');
2525

2626
--
2727
-- Move mod_version to the right position for the atum template

‎administrator/components/com_banners/src/Model/BannersModel.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ class BannersModel extends ListModel
2828
*
2929
* @param array $config An optional associative array of configuration settings.
3030
*
31-
* @see JControllerLegacy
3231
* @since 1.6
3332
*/
3433
public function __construct($config = array())

‎administrator/components/com_banners/src/Model/ClientsModel.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ class ClientsModel extends ListModel
2727
*
2828
* @param array $config An optional associative array of configuration settings.
2929
*
30-
* @see JControllerLegacy
3130
* @since 1.6
3231
*/
3332
public function __construct($config = array())

‎administrator/components/com_banners/src/Model/TracksModel.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ class TracksModel extends ListModel
4040
*
4141
* @param array $config An optional associative array of configuration settings.
4242
*
43-
* @see JControllerLegacy
4443
* @since 1.6
4544
*/
4645
public function __construct($config = array())

‎administrator/components/com_categories/src/Controller/CategoryController.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ class CategoryController extends FormController
4545
* @param Input|null $input Input
4646
*
4747
* @since 1.6
48-
* @see \JControllerLegacy
4948
* @throws \Exception
5049
*/
5150
public function __construct($config = array(), MVCFactoryInterface $factory = null, CMSApplication $app = null, Input $input = null)

‎administrator/components/com_categories/src/Model/CategoriesModel.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ class CategoriesModel extends ListModel
3434
* @param array $config An optional associative array of configuration settings.
3535
* @param MVCFactoryInterface|null $factory The factory.
3636
*
37-
* @see \JControllerLegacy
3837
* @since 1.6
3938
*/
4039
public function __construct($config = array(), MVCFactoryInterface $factory = null)

‎administrator/components/com_categories/tmpl/category/edit.php‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,14 @@
3434

3535
$c = Factory::getApplication()->bootComponent($this->state->get('category.extension'));
3636

37-
$wcontext = $c->getCategoryWorkflowContext($this->state->get('category.section'));
38-
39-
if (!$c instanceof WorkflowServiceInterface
40-
|| !$c->isWorkflowActive($wcontext))
37+
if ($c instanceof WorkflowServiceInterface)
4138
{
42-
$this->ignore_fieldsets[] = 'workflow';
39+
$wcontext = $c->getCategoryWorkflowContext($this->state->get('category.section'));
40+
41+
if (!$c->isWorkflowActive($wcontext))
42+
{
43+
$this->ignore_fieldsets[] = 'workflow';
44+
}
4345
}
4446

4547
$this->useCoreUI = true;

0 commit comments

Comments
 (0)