[5.2] Multilang: Remove restrictions for home language menu items

PR w związku ze zmianą oryginału https://github.com/joomla/joomla-cms/pull/43862 Poniżej zmiany w oryginale:

Click to expand the diff!

```diff diff --git a/administrator/components/com_languages/tmpl/multilangstatus/default.php b/administrator/components/com_languages/tmpl/multilangstatus/default.php index 58734a05f8965..8c11150253d8c 100644 --- a/administrator/components/com_languages/tmpl/multilangstatus/default.php +++ b/administrator/components/com_languages/tmpl/multilangstatus/default.php @@ -55,13 +55,6 @@ - defaultHome == true) : ?> -

- - - -

- statuses as $status) : ?> lang_code && $status->published == 1 && $status->home_published != 1) : ?> diff --git a/administrator/components/com_menus/presets/alternate.xml b/administrator/components/com_menus/presets/alternate.xml index ab129265fbe52..3f2a69d0b8d9f 100644 --- a/administrator/components/com_menus/presets/alternate.xml +++ b/administrator/components/com_menus/presets/alternate.xml @@ -225,11 +225,11 @@ type="separator" title="JSITE" hidden="false" - sql_select="a.id, a.title, a.menutype, CASE COALESCE(SUM(m.home), 0) WHEN 0 THEN '' WHEN 1 THEN CASE m.language WHEN '*' THEN 'class:icon-home' ELSE CONCAT('image:', l.lang_code) END ELSE 'image:mod_languages/icon-16-language.png' END AS icon" + sql_select="a.id, a.title, a.menutype, CASE COALESCE(SUM(m.home), 0) WHEN 0 THEN '' WHEN 1 THEN CASE MAX(m.language) WHEN '*' THEN 'class:icon-home' ELSE CONCAT('image:', MAX(l.lang_code)) END ELSE 'class:icon-home' END AS icon" sql_from="#__menu_types AS a" sql_where="a.client_id = 0" sql_leftjoin="#__menu AS m ON m.menutype = a.menutype AND m.home = 1 LEFT JOIN #__languages AS l ON l.lang_code = m.language" - sql_group="a.id, a.title, a.menutype, m.language, l.lang_code" + sql_group="a.id, a.title, a.menutype" sql_order="a.id DESC" > %s Content Language. The multilingual feature may not function properly or the site may not be reachable!" COM_LANGUAGES_MULTILANGSTATUS_CONTENT_LANGUAGE_TRASHED="The %s Content Language is trashed. The language will not display on the site." COM_LANGUAGES_MULTILANGSTATUS_CONTENT_TABLE_CAPTION="Content Language Status" +; The following string is deprecated and will be removed with 7.0 COM_LANGUAGES_MULTILANGSTATUS_DEFAULT_HOME_MODULE_PUBLISHED="The menu module displaying the Home menu item set to language "All" should not be published." COM_LANGUAGES_MULTILANGSTATUS_ERROR_CONTENT_LANGUAGE="A Default Home page is assigned to the %s Content Language although a Site Language for this Content Language is not installed or enabled AND/OR the Content Language is not published. The language will not display on the site." COM_LANGUAGES_MULTILANGSTATUS_ERROR_DEFAULT_CONTENT_LANGUAGE="The Content Language for the %s default Site Language is unpublished or does not exist. The multilingual feature may not function properly or the site may not be reachable!" diff --git a/libraries/src/Table/Menu.php b/libraries/src/Table/Menu.php index c035ef32006d1..7a25206aaa439 100644 --- a/libraries/src/Table/Menu.php +++ b/libraries/src/Table/Menu.php @@ -258,22 +258,6 @@ public function store($updateNulls = true) } if ($this->home == '1') { - // Verify that the home page for this menu is unique. - if ( - $table->load( - [ - 'menutype' => $this->menutype, - 'client_id' => (int) $this->client_id, - 'home' => '1', - ] - ) - && ($table->language != $this->language) - ) { - $this->setError(Text::_('JLIB_DATABASE_ERROR_MENU_HOME_NOT_UNIQUE_IN_MENU')); - - return false; - } - // Verify that the home page for this language is unique per client id if ($table->load(['home' => '1', 'language' => $this->language, 'client_id' => (int) $this->client_id])) { if ($table->checked_out && $table->checked_out != $this->checked_out) { ```

JoomlaPolska / jezyk-J4

[5.2] Multilang: Remove restrictions for home language menu items #569