INSERT instead of UPDATE in taxonomy_term_save() when $term->tid is not found

Problem/Motivation

I want to create terms with a pre-defined TID (not using the default increment of the DB). So I call the taxonomy_term_save($term) with a (non-existing) value for $term->tid. The save function checks for an original file to update but can't find one (which is OK), but when deciding on the INSERT or UPDATE operation, a check for the $term->tid is made. This leads to a situation where an UPDATE is done instead of an INSERT.

Proposed resolution

To me it would make more sense to either

• check for the $term->original value instead of $term->tid
• make it more obvious that you're not supposed to set the TID yourself

To me the patch is very simple (line 604 in taxonomy.module):

function taxonomy_term_save($term) {
  ...
  // Load the stored entity, if any.
  if (!empty($term->tid) && !isset($term->original)) {
    $term->original = entity_load_unchanged('taxonomy_term', $term->tid);
  }
  ...
  module_invoke_all('entity_presave', $term, 'taxonomy_term');

-  if (empty($term->tid)) {
+  if (empty($term->tid) || !$term->original) {
    $op = 'insert';
    ...
}