From 3da6e2889bcb4df086bbfc14eb19ac7cade2beef Mon Sep 17 00:00:00 2001
From: Josh Perez <josh.perez@airbnb.com>
Date: Sat, 16 Jan 2016 21:21:08 -0800
Subject: [PATCH] Only add children when there are children

---
 src/renderers/dom/client/wrappers/ReactDOMOption.js       | 5 ++++-
 .../dom/client/wrappers/__tests__/ReactDOMOption-test.js  | 8 ++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/renderers/dom/client/wrappers/ReactDOMOption.js b/src/renderers/dom/client/wrappers/ReactDOMOption.js
index b3cd6c2ceb..31e6050030 100644
--- a/src/renderers/dom/client/wrappers/ReactDOMOption.js
+++ b/src/renderers/dom/client/wrappers/ReactDOMOption.js
@@ -85,7 +85,10 @@ var ReactDOMOption = {
       }
     });
 
-    nativeProps.children = content;
+    if (content) {
+      nativeProps.children = content;
+    }
+
     return nativeProps;
   },
 
diff --git a/src/renderers/dom/client/wrappers/__tests__/ReactDOMOption-test.js b/src/renderers/dom/client/wrappers/__tests__/ReactDOMOption-test.js
index b3fca56fc2..0d52d83df3 100644
--- a/src/renderers/dom/client/wrappers/__tests__/ReactDOMOption-test.js
+++ b/src/renderers/dom/client/wrappers/__tests__/ReactDOMOption-test.js
@@ -63,4 +63,12 @@ describe('ReactDOMOption', function() {
     expect(console.error.calls.length).toBe(0);
     expect(node.innerHTML).toBe('1  2');
   });
+
+  it('should be able to use dangerouslySetInnerHTML on option', function() {
+    var stub = <option dangerouslySetInnerHTML={{ __html: 'foobar' }} />;
+    stub = ReactTestUtils.renderIntoDocument(stub);
+
+    var node = ReactDOM.findDOMNode(stub);
+    expect(node.innerHTML).toBe('foobar');
+  });
 });