Fix merging tags into a new tag that doesn't exist.

Fixes habari/habari#407.
habari · Nov 11, 2012 · d7dcfec · d7dcfec
1 parent 881b43b
commit d7dcfec
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/classes/vocabulary.php b/classes/vocabulary.php
@@ -790,8 +790,9 @@ public function merge( $master, $tags, $object_type = 'post' )
 
 		if ( !isset( $master_term->term ) ) {
 			// it didn't exist, so we assume it's tag text and create it
-			$ok = $this->add_term( $master );
-			if( !$ok ) {
+			$master_term = $this->add_term( $master );
+
+			if( !$master_term ) {
 				return;
 			}