Merge branch 'MAGETWO-43102' of https://github.corp.magento.com/magento-troll/magento2ce into MAGETWO-48642

Conflicts:
	app/code/Magento/Catalog/Controller/Adminhtml/Category/Save.php

Author: vzabaznov

.htaccess

@@ -243,10 +243,6 @@
         order allow,deny
         deny from all
     </Files>
-    <Files CONTRIBUTOR_LICENSE_AGREEMENT.html>
-        order allow,deny
-        deny from all
-    </Files>
     <Files COPYING.txt>
         order allow,deny
         deny from all

.htaccess.sample

@@ -209,10 +209,6 @@
         order allow,deny
         deny from all
     </Files>
-    <Files CONTRIBUTOR_LICENSE_AGREEMENT.html>
-        order allow,deny
-        deny from all
-    </Files>
     <Files COPYING.txt>
         order allow,deny
         deny from all

CONTRIBUTING.md

@@ -10,7 +10,7 @@ The Magento 2 development team will review all issues and contributions submitte
 
 ## Contribution requirements
 
-1. Contributions must adhere to [Magento coding standards](http://devdocs.magento.com/guides/v1.0/coding-standards/bk-coding-standards.html).
+1. Contributions must adhere to [Magento coding standards](http://devdocs.magento.com/guides/v2.0/coding-standards/bk-coding-standards.html).
 2. Pull requests (PRs) must be accompanied by a meaningful description of their purpose. Comprehensive descriptions increase the chances of a pull request to be merged quickly and without additional clarification requests.
 3. Commits must be accompanied by meaningful commit messages.
 4. PRs which include bug fixing, must be accompanied with step-by-step description of how to reproduce the bug.
@@ -25,7 +25,7 @@ The Magento 2 development team will review all issues and contributions submitte
 If you are a new GitHub user, we recommend that you create your own [free github account](https://github.com/signup/free). By doing that, you will be able to collaborate with the Magento 2 development team, “fork” the Magento 2 project and be able to easily send “pull requests”.
 
 1. Search current [listed issues](https://github.com/magento/magento2/issues) (open or closed) for similar proposals of intended contribution before starting work on a new contribution.
-2. Review the [Contributor License Agreement](https://github.com/magento/magento2/blob/master/CONTRIBUTOR_LICENSE_AGREEMENT.html) if this is your first time contributing.
+2. Review the [Contributor License Agreement](https://magento.com/legaldocuments/mca) if this is your first time contributing.
 3. Create and test your work.
-4. Fork the Magento 2 repository according to [Fork a repository instructions](http://devdocs.magento.com/guides/v1.0/contributor-guide/CONTRIBUTING.html#fork) and when you are ready to send us a pull request – follow [Create a pull request instructions](http://devdocs.magento.com/guides/v1.0/contributor-guide/CONTRIBUTING.html#pull_request).
+4. Fork the Magento 2 repository according to [Fork a repository instructions](http://devdocs.magento.com/guides/v2.0/contributor-guide/contributing.html#fork) and when you are ready to send us a pull request – follow [Create a pull request instructions](http://devdocs.magento.com/guides/v2.0/contributor-guide/contributing.html#pull_request).
 5. Once your contribution is received, Magento 2 development team will review the contribution and collaborate with you as needed to improve the quality of the contribution.

CONTRIBUTOR_LICENSE_AGREEMENT.html

@@ -30,7 +30,7 @@ public function render(\Magento\Framework\DataObject $row)
             $truncateLength = $this->getColumn()->getTruncate();
         }
         $text = $this->filterManager->truncate(parent::_getValue($row), ['length' => $truncateLength]);
-        if ($this->getColumn()->getEscape()) {
+        if (!$this->getColumn()->hasEscape() || $this->getColumn()->getEscape()) {
             $text = $this->escapeHtml($text);
         }
         if ($this->getColumn()->getNl2br()) {

app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Longtext.php

@@ -100,7 +100,7 @@ public function execute()
 
         $data['general'] = $this->getRequest()->getPostValue();
         $isNewCategory = !isset($data['general']['entity_id']);
-        $data = $this->stringToBoolConverting($this->stringToBoolInputs, $data);
+        $data = $this->stringToBoolConverting($data);
         $data = $this->imagePreprocessing($data);
         $storeId = isset($data['general']['store_id']) ? $data['general']['store_id'] : null;
         $parentId = isset($data['general']['parent']) ? $data['general']['parent'] : null;
@@ -234,8 +234,7 @@ public function imagePreprocessing($data)
     {
         if (!isset($_FILES) || (isset($_FILES['image']) && $_FILES['image']['name'] === '' )) {
             unset($data['general']['image']);
-            if (
-                isset($data['general']['savedImage']['delete']) &&
+            if (isset($data['general']['savedImage']['delete']) &&
                 $data['general']['savedImage']['delete']
             ) {
                 $data['general']['image']['delete'] = $data['general']['savedImage']['delete'];
@@ -247,17 +246,20 @@ public function imagePreprocessing($data)
     /**
      * Converting inputs from string to boolean
      *
-     * @param array $stringToBoolInputs
      * @param array $data
+     * @param array $stringToBoolInputs
      *
      * @return array
      */
-    public function stringToBoolConverting($stringToBoolInputs, $data)
+    public function stringToBoolConverting($data, $stringToBoolInputs = null)
     {
+        if (null === $stringToBoolInputs) {
+            $stringToBoolInputs = $this->stringToBoolInputs;
+        }
         foreach ($stringToBoolInputs as $key => $value) {
             if (is_array($value)) {
                 if (isset($data[$key])) {
-                    $data[$key] = $this->stringToBoolConverting($value, $data[$key]);
+                    $data[$key] = $this->stringToBoolConverting($data[$key], $value);
                 }
             } else {
                 if (isset($data[$value])) {

app/code/Magento/Catalog/Controller/Adminhtml/Category/Save.php

@@ -11,9 +11,12 @@
 use Magento\Eav\Model\Config;
 use Magento\Eav\Model\Entity\Type;
 use Magento\Catalog\Model\ResourceModel\Category\CollectionFactory as CategoryCollectionFactory;
+use Magento\Store\Model\Store;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Ui\Component\Form\Field;
 use Magento\Ui\DataProvider\EavValidationRules;
+use Magento\Catalog\Model\CategoryFactory;
+use Magento\Framework\Exception\NoSuchEntityException;
 
 /**
  * Class DataProvider
@@ -22,6 +25,11 @@
  */
 class DataProvider extends \Magento\Ui\DataProvider\AbstractDataProvider
 {
+    /**
+     * @var string
+     */
+    protected $requestScopeFieldName = 'store';
+
     /**
      * @var array
      */
@@ -86,7 +94,7 @@ class DataProvider extends \Magento\Ui\DataProvider\AbstractDataProvider
     /**
      * @var \Magento\Framework\App\RequestInterface
      */
-    private $request;
+    protected $request;
 
 
     /**
@@ -100,7 +108,12 @@ class DataProvider extends \Magento\Ui\DataProvider\AbstractDataProvider
     private $storeManager;
 
     /**
-     * Constructor
+     * @var CategoryFactory
+     */
+    private $categoryFactory;
+
+    /**
+     * DataProvider constructor
      *
      * @param string $name
      * @param string $primaryFieldName
@@ -111,9 +124,9 @@ class DataProvider extends \Magento\Ui\DataProvider\AbstractDataProvider
      * @param \Magento\Framework\Registry $registry
      * @param Config $eavConfig
      * @param \Magento\Framework\App\RequestInterface $request
+     * @param CategoryFactory $categoryFactory
      * @param array $meta
      * @param array $data
-     * @throws \Magento\Framework\Exception\LocalizedException
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -126,6 +139,7 @@ public function __construct(
         \Magento\Framework\Registry $registry,
         Config $eavConfig,
         \Magento\Framework\App\RequestInterface $request,
+        CategoryFactory $categoryFactory,
         array $meta = [],
         array $data = []
     ) {
@@ -136,6 +150,7 @@ public function __construct(
         $this->registry = $registry;
         $this->storeManager = $storeManager;
         $this->request = $request;
+        $this->categoryFactory = $categoryFactory;
         parent::__construct($name, $primaryFieldName, $requestFieldName, $meta, $data);
         $this->meta = $this->prepareMeta($this->meta);
     }
@@ -282,7 +297,7 @@ protected function addUseConfigSettings($categoryData)
     protected function addUseDefaultSettings($category, $categoryData)
     {
         if ($category->getExistsStoreValueFlag('url_key') ||
-            $category->getStoreId() === \Magento\Store\Model\Store::DEFAULT_STORE_ID
+            $category->getStoreId() === Store::DEFAULT_STORE_ID
         ) {
             $categoryData['use_default']['url_key'] = false;
         } else {
@@ -296,10 +311,25 @@ protected function addUseDefaultSettings($category, $categoryData)
      * Get current category
      *
      * @return Category
+     * @throws NoSuchEntityException
      */
     public function getCurrentCategory()
     {
-        return $this->registry->registry('category');
+        $category = $this->registry->registry('category');
+        if ($category) {
+            return $category;
+        }
+        $requestId = $this->request->getParam($this->requestFieldName);
+        $requestScope = $this->request->getParam($this->requestScopeFieldName, Store::DEFAULT_STORE_ID);
+        if ($requestId) {
+            $category = $this->categoryFactory->create();
+            $category->setStoreId($requestScope);
+            $category->load($requestId);
+            if (!$category->getId()) {
+                throw NoSuchEntityException::singleField('id', $requestId);
+            }
+        }
+        return $category;
     }
 
     /**
@@ -418,14 +448,14 @@ protected function getFieldsMap()
                 [
                     'custom_use_parent_settings',
                     'custom_apply_to_products',
+                    'custom_design',
                     'page_layout',
                     'custom_layout_update',
                 ],
             'schedule_design_update' =>
                 [
                     'custom_design_from',
                     'custom_design_to',
-                    'custom_design',
                 ],
             'category_view_optimization' =>
                 [