Merge pull request mui#1651 from louy/master

oliviertassinari · oliviertassinari · commit 4e29f2728901 · 2015-10-21T20:49:41.000+02:00
[Card] Fix a potential error in &lt;Card&gt;
diff --git a/src/card/card.jsx b/src/card/card.jsx
@@ -31,7 +31,7 @@ const Card = React.createClass({
       let newChild = undefined;
       let newProps = {};
       let element = currentChild;
-      if (!currentChild) {
+      if (!currentChild || !currentChild.props) {
         return null;
       }
       if (this.state.expanded === false && currentChild.props.expandable === true)

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ const Card = React.createClass({`
`31`	`31`	`let newChild = undefined;`
`32`	`32`	`let newProps = {};`
`33`	`33`	`let element = currentChild;`
`34`		`- if (!currentChild) {`
	`34`	`+ if (!currentChild \|\| !currentChild.props) {`
`35`	`35`	`return null;`
`36`	`36`	`}`
`37`	`37`	`if (this.state.expanded === false && currentChild.props.expandable === true)`