Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[4.3] Revert 38576 #40060

Merged
merged 5 commits into from
Mar 11, 2023
Merged

[4.3] Revert 38576 #40060

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9e68464
Revert PR #38576
joomdonation Mar 9, 2023
2ca9256
CS
joomdonation Mar 9, 2023
d7a25b5
Merge branch '4.3-dev' into revert_38576
QuyTon Mar 11, 2023
1c07342
Merge branch '4.3-dev' into revert_38576
obuisard Mar 11, 2023
95c3a11
Merge branch '4.3-dev' into revert_38576
obuisard Mar 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions administrator/components/com_tags/src/Table/TagTable.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,13 +191,10 @@ public function store($updateNulls = true)
// Verify that the alias is unique
$table = new static($this->getDbo());

if (
$table->load(['alias' => $this->alias, 'parent_id' => (int) $this->parent_id])
&& ($table->id != $this->id || $this->id == 0)
) {
// Is the existing tag trashed?
if ($table->load(['alias' => $this->alias]) && ($table->id != $this->id || $this->id == 0)) {
$this->setError(Text::_('COM_TAGS_ERROR_UNIQUE_ALIAS'));

// Is the existing tag trashed?
if ($table->published === -2) {
$this->setError(Text::_('COM_TAGS_ERROR_UNIQUE_ALIAS_TRASHED'));
}
Expand Down
2 changes: 1 addition & 1 deletion administrator/language/en-GB/com_tags.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ COM_TAGS_COUNT_UNPUBLISHED_ITEMS="Unpublished items"
COM_TAGS_EMPTYSTATE_BUTTON_ADD="Add your first tag"
COM_TAGS_EMPTYSTATE_CONTENT="Tags in Joomla! provide a flexible way of organizing content. The same tag can be applied to many different content items across content types."
COM_TAGS_EMPTYSTATE_TITLE="No Tags have been created yet."
COM_TAGS_ERROR_UNIQUE_ALIAS="Another Tag with the same parent tag has the same alias."
COM_TAGS_ERROR_UNIQUE_ALIAS="Another Tag has the same alias (remember it may be a trashed item)."
COM_TAGS_ERROR_UNIQUE_ALIAS_TRASHED="A trashed Tag with the same parent tag has the same alias."
COM_TAGS_EXCLUDE="Exclude"
COM_TAGS_FIELD_CONTENT_TYPE_LABEL="Content types"
Expand Down
5 changes: 1 addition & 4 deletions libraries/src/Table/ContentType.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,7 @@ public function store($updateNulls = false)
// Verify that the alias is unique
$table = Table::getInstance('Contenttype', 'JTable', ['dbo' => $this->getDbo()]);

if (
$table->load(['alias' => $this->alias, 'parent_id' => (int) $this->parent_id])
&& ($table->id != $this->id || $this->id == 0)
) {
if ($table->load(['type_alias' => $this->type_alias]) && ($table->type_id != $this->type_id || $this->type_id == 0)) {
$this->setError(Text::_('COM_TAGS_ERROR_UNIQUE_ALIAS'));

return false;
Expand Down