Merge branch 'MAGETWO-48970' of https://github.corp.magento.com/magento-tango/magento2ce into MAGETWO-51470

shiftedreality · shiftedreality · commit 1252ea33c842 · 2016-04-05T10:01:21.000+03:00
diff --git a/app/code/Magento/Cms/view/adminhtml/layout/cms_page_edit.xml b/app/code/Magento/Cms/view/adminhtml/layout/cms_page_edit.xml
@@ -6,7 +6,6 @@
  */
 -->
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="admin-1column" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
-    <update handle="styles"/>
     <body>
         <referenceContainer name="content">
             <uiComponent name="cms_page_form"/>
diff --git a/app/code/Magento/Widget/Model/Widget.php b/app/code/Magento/Widget/Model/Widget.php
@@ -309,7 +309,7 @@ public function getWidgetDeclaration($type, $params = [], $asIs = true)
             } elseif (trim($value) == '') {
                 $widget = $this->getConfigAsObject($type);
                 $parameters = $widget->getParameters();
-                if (is_object($parameters[$name])) {
+                if (isset($parameters[$name]) && is_object($parameters[$name])) {
                     $value = $parameters[$name]->getValue();
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -309,7 +309,7 @@ public function getWidgetDeclaration($type, $params = [], $asIs = true)`
`309`	`309`	`} elseif (trim($value) == '') {`
`310`	`310`	`$widget = $this->getConfigAsObject($type);`
`311`	`311`	`$parameters = $widget->getParameters();`
`312`		`- if (is_object($parameters[$name])) {`
	`312`	`+ if (isset($parameters[$name]) && is_object($parameters[$name])) {`
`313`	`313`	`$value = $parameters[$name]->getValue();`
`314`	`314`	`}`
`315`	`315`	`}`