[#27196] Unable to add a trashed Content Language again

administrator/components/com_languages/models/language.php

@@ -168,7 +168,7 @@ public function save($data)
 
 		// Store the data
 		if (!$table->store()) {
-			$this->setError($this->_db->getErrorMsg());
+			$this->setError($table->getError());
 			return false;
 		}
 

administrator/language/en-GB/en-GB.lib_joomla.ini

@@ -164,6 +164,7 @@ JLIB_DATABASE_ERROR_INVALID_LOCATION="%s: :setLocation - Invalid location"
 JLIB_DATABASE_ERROR_INVALID_NODE_RECURSION="%s: :move Failed - Cannot move the node to be a child of itself"
 JLIB_DATABASE_ERROR_INVALID_PARENT_ID="Invalid parent id."
 JLIB_DATABASE_ERROR_LANGUAGE_NO_TITLE="The language should have a title"
+JLIB_DATABASE_ERROR_LANGUAGE_UNIQUE_SEF="The language must have a unique language code"
 JLIB_DATABASE_ERROR_LOAD_DATABASE_DRIVER="Unable to load Database Driver: %s"
 JLIB_DATABASE_ERROR_MENUTYPE_EMPTY="Menu type empty"
 JLIB_DATABASE_ERROR_MENUTYPE_EXISTS="Menu type exists: %s"

language/en-GB/en-GB.lib_joomla.ini

@@ -164,6 +164,7 @@ JLIB_DATABASE_ERROR_INVALID_LOCATION="%s: :setLocation - Invalid location"
 JLIB_DATABASE_ERROR_INVALID_NODE_RECURSION="%s: :move Failed - Cannot move the node to be a child of itself"
 JLIB_DATABASE_ERROR_INVALID_PARENT_ID="Invalid parent id."
 JLIB_DATABASE_ERROR_LANGUAGE_NO_TITLE="The language should have a title"
+JLIB_DATABASE_ERROR_LANGUAGE_UNIQUE_SEF="The language must have a unique language code"
 JLIB_DATABASE_ERROR_LOAD_DATABASE_DRIVER="Unable to load Database Driver: %s"
 JLIB_DATABASE_ERROR_MENUTYPE_EMPTY="Menu type empty"
 JLIB_DATABASE_ERROR_MENUTYPE_EXISTS="Menu type exists: %s"

libraries/joomla/database/table/language.php

@@ -50,4 +50,25 @@ public function check()
 
 		return true;
 	}
+
+	/**
+	 * Overrides JTable::store to set modified data and user id.
+	 *
+	 * @param   boolean  $updateNulls  True to update fields even if they are null.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   11.3
+	 */
+	public function store($updateNulls = false)
+	{
+		// Verify that the sef field is unique
+		$table = JTable::getInstance('Language', 'JTable');
+		if ($table->load(array('sef' => $this->sef)) && ($table->id != $this->id || $this->id == 0))
+		{
+			$this->setError(JText::_('JLIB_DATABASE_ERROR_LANGUAGE_UNIQUE_SEF'));
+			return false;
+		}
+		return parent::store($updateNulls);
+	}
 }