Skip to content

Commit a65f87f

Browse files
committed
Correction of TagTable.php conflict
1 parent b55890c commit a65f87f

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

administrator/components/com_tags/src/Table/TagTable.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,10 @@ public function store($updateNulls = true)
191191
// Verify that the alias is unique
192192
$table = new static($this->getDbo());
193193

194-
if ($table->load(array('alias' => $this->alias)) && ($table->id != $this->id || $this->id == 0)) {
194+
if (
195+
$table->load(array('alias' => $this->alias, 'parent_id' => (int) $this->parent_id))
196+
&& ($table->id != $this->id || $this->id == 0)
197+
) {
195198
// Is the existing tag trashed?
196199
$this->setError(Text::_('COM_TAGS_ERROR_UNIQUE_ALIAS'));
197200

0 commit comments

Comments
 (0)