Delete UCM content entries when Joomla articles are deleted (joomla#1…

…3592)

libraries/cms/helper/tags.php

@@ -362,22 +362,37 @@ public function createTagsFromMetadata($metadata)
 	 * Method to delete the tag mappings and #__ucm_content record for for an item
 	 *
 	 * @param   JTableInterface  $table          JTable object of content table where delete occurred
-	 * @param   integer          $contentItemId  ID of the content item.
+	 * @param   integer|array    $contentItemId  ID of the content item. Or an array of key/value pairs with array key
+	 *                                           being a primary key name and value being the content item ID. Note
+	 *                                           multiple primary keys are not supported
 	 *
 	 * @return  boolean  true on success, false on failure
 	 *
 	 * @since   3.1
+	 * @throws  InvalidArgumentException
 	 */
 	public function deleteTagData(JTableInterface $table, $contentItemId)
 	{
-		$result = $this->unTagItem($contentItemId, $table);
+		$key = $table->getKeyName();
 
-		/**
-		 * @var JTableCorecontent $ucmContentTable
-		 */
+		if (!is_array($contentItemId))
+		{
+			$contentItemId = array($key => $contentItemId);
+		}
+
+		// If we have multiple items for the content item primary key we currently don't support this so
+		// throw an InvalidArgumentException for now
+		if (count($contentItemId) != 1)
+		{
+			throw new InvalidArgumentException('Multiple primary keys are not supported as a content item id');
+		}
+
+		$result = $this->unTagItem($contentItemId[$key], $table);
+
+		/** @var JTableCorecontent $ucmContentTable */
 		$ucmContentTable = JTable::getInstance('Corecontent');
 
-		return $result && $ucmContentTable->deleteByContentId($contentItemId, $this->typeAlias);
+		return $result && $ucmContentTable->deleteByContentId($contentItemId[$key], $this->typeAlias);
 	}
 
 	/**