From 4d1bfcc8e153fec6180324fa79006bc1c351ebd9 Mon Sep 17 00:00:00 2001
From: Max <contact@mstoiber.com>
Date: Sun, 28 Feb 2016 22:33:23 +0100
Subject: [PATCH] Fix renderToStaticMarkup invariant

---
 src/renderers/dom/server/ReactServerRendering.js    | 13 ++++++++-----
 .../server/__tests__/ReactServerRendering-test.js   |  2 +-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/renderers/dom/server/ReactServerRendering.js b/src/renderers/dom/server/ReactServerRendering.js
index ff769f2bd6..5a5d604b7d 100644
--- a/src/renderers/dom/server/ReactServerRendering.js
+++ b/src/renderers/dom/server/ReactServerRendering.js
@@ -28,11 +28,6 @@ var invariant = require('invariant');
  * @return {string} the HTML markup
  */
 function renderToStringImpl(element, makeStaticMarkup) {
-  invariant(
-    ReactElement.isValidElement(element),
-    'renderToString(): You must pass a valid ReactElement.'
-  );
-
   var transaction;
   try {
     ReactUpdates.injection.injectBatchingStrategy(ReactServerBatchingStrategy);
@@ -61,10 +56,18 @@ function renderToStringImpl(element, makeStaticMarkup) {
 }
 
 function renderToString(element) {
+  invariant(
+    ReactElement.isValidElement(element),
+    'renderToString(): You must pass a valid ReactElement.'
+  );
   return renderToStringImpl(element, false);
 }
 
 function renderToStaticMarkup(element) {
+  invariant(
+    ReactElement.isValidElement(element),
+    'renderToStaticMarkup(): You must pass a valid ReactElement.'
+  );
   return renderToStringImpl(element, true);
 }
 
diff --git a/src/renderers/dom/server/__tests__/ReactServerRendering-test.js b/src/renderers/dom/server/__tests__/ReactServerRendering-test.js
index a32ba08c08..0a26c6b5f0 100644
--- a/src/renderers/dom/server/__tests__/ReactServerRendering-test.js
+++ b/src/renderers/dom/server/__tests__/ReactServerRendering-test.js
@@ -360,7 +360,7 @@ describe('ReactServerRendering', function() {
           'not a component'
         )
       ).toThrow(
-        'renderToString(): You must pass a valid ReactElement.'
+        'renderToStaticMarkup(): You must pass a valid ReactElement.'
       );
     });