Merge branch 'master' into featured-notifications

This commit is contained in:
Wyatt Johnson
2018-02-28 15:30:47 -07:00
committed by GitHub
+2 -1
View File
@@ -72,7 +72,8 @@ class Slot extends React.Component {
} = this.props;
const { plugins } = this.context;
let children = this.getChildren();
const pluginConfig = get(reduxState, 'config.pluginConfig') || emptyConfig;
const pluginConfig =
get(reduxState, 'config.plugins_config') || emptyConfig;
if (children.length === 0 && DefaultComponent) {
const props = plugins.getSlotComponentProps(
DefaultComponent,