trunk/bb-includes/functions.php: Nice bb_delete_option() fix from so1o.

Modified: trunk/bb-includes/functions.php (559 => 560)

--- trunk/bb-includes/functions.php	2006-12-08 21:57:41 UTC (rev 559)
+++ trunk/bb-includes/functions.php	2006-12-11 00:51:59 UTC (rev 560)
 -631,14 +631,14 
 		$cache =& $bb_user_cache;
 		$table = $bbdb->usermeta;
 		$field = 'user_id';
-		$meta_id = 'umeta_id';
+		$meta_id_field = 'umeta_id';
 		break;
 	case 'topic' :
 		global $bb_topic_cache;
 		$cache =& $bb_topic_cache;
 		$table = $bbdb->topicmeta;
 		$field = 'topic_id';
-		$meta_id = 'meta_id';
+		$meta_id_field = 'meta_id';
 		break;
 	endswitch;
 
 -652,9 +652,9 
 	$meta_value = $bbdb->escape( $meta_value );
 
 	if ( empty($meta_value) )
-		$meta_id = $bbdb->get_var("SELECT $meta_id FROM $table WHERE $field = '$type_id' AND meta_key = '$meta_key'");
+		$meta_id = $bbdb->get_var("SELECT $meta_id_field FROM $table WHERE $field = '$type_id' AND meta_key = '$meta_key'");
 	else
-		$meta_id = $bbdb->get_var("SELECT $meta_id FROM $table WHERE $field = '$type_id' AND meta_key = '$meta_key' AND meta_value = '$meta_value'");
+		$meta_id = $bbdb->get_var("SELECT $meta_id_field FROM $table WHERE $field = '$type_id' AND meta_key = '$meta_key' AND meta_value = '$meta_value'");
 
 	if ( !$meta_id )
 		return false;
 -662,7 +662,7 
 	if ( empty($meta_value) )
 		$bbdb->query("DELETE FROM $table WHERE $field = '$type_id' AND meta_key = '$meta_key'");
 	else
-		$bbdb->query(";DELETE FROM $table WHERE $meta_id = '$meta_id'");
+		$bbdb->query("DELETE FROM $table WHERE $meta_id_field = '$meta_id'");
 
 	unset($cache[$type_id]->{$meta_key});
 	if ( 0 === strpos($meta_key, $bb_table_prefix) )