HHVM-169: Always encode ODS field when serializing Persistable documents

Author: derickr

bson.cpp

@@ -397,16 +397,14 @@ void VariantToBsonConverter::_convertSerializable(bson_t *bson, const char *key,
 	/* Convert to array so that we can handle it well */
 	properties = result.toArray();
 
-	if (m_level > 0 || (m_flags & HIPPO_BSON_NO_ROOT_ODS) == 0) {
-		if (v.instanceof(s_MongoDriverBsonPersistable_className)) {
-			const char *class_name = cls->nameStr().c_str();
-			Object obj = createMongoBsonBinaryObject(
-				(const uint8_t *) class_name,
-				strlen(class_name),
-				(bson_subtype_t) 0x80
-			);
-			properties.add(String(s_MongoDriverBsonODM_fieldName), obj);
-		}
+	if (v.instanceof(s_MongoDriverBsonPersistable_className)) {
+		const char *class_name = cls->nameStr().c_str();
+		Object obj = createMongoBsonBinaryObject(
+			(const uint8_t *) class_name,
+			strlen(class_name),
+			(bson_subtype_t) 0x80
+		);
+		properties.add(String(s_MongoDriverBsonODM_fieldName), obj);
 	}
 
 	convertDocument(bson, key, result.isObject() ? Variant(Variant(properties).toObject()) : Variant(properties));

bson.h

@@ -28,7 +28,6 @@ namespace HPHP {
 #define HIPPO_BSON_NO_FLAGS    0x00
 #define HIPPO_BSON_ADD_ID      0x01
 #define HIPPO_BSON_RETURN_ID   0x02
-#define HIPPO_BSON_NO_ROOT_ODS 0x04
 
 /* This is not a bitfield */
 #define HIPPO_TYPEMAP_DEFAULT    0x03