Merge remote-tracking branch 'origin/develop' into PR-webdev

app/code/Magento/Authorization/Model/ResourceModel/Rules.php

@@ -103,6 +103,8 @@ public function saveRel(\Magento\Authorization\Model\Rules $rule)
 
                     $connection->insert($this->getMainTable(), $insertData);
                 } else {
+                    /** Give basic admin permissions to any admin */
+                    $postedResources[] = \Magento\Backend\App\AbstractAction::ADMIN_RESOURCE;
                     $acl = $this->_aclBuilder->getAcl();
                     /** @var $resource \Magento\Framework\Acl\AclResource */
                     foreach ($acl->getResources() as $resourceId) {

app/code/Magento/Persistent/Model/Session.php

@@ -289,7 +289,7 @@ public function deleteByCustomerId($customerId, $clearCookie = true)
      */
     public function removePersistentCookie()
     {
-        $cookieMetadata = $this->_cookieMetadataFactory->createCookieMetadata()
+        $cookieMetadata = $this->_cookieMetadataFactory->createSensitiveCookieMetadata()
             ->setPath($this->sessionConfig->getCookiePath());
         $this->_cookieManager->deleteCookie(self::COOKIE_NAME, $cookieMetadata);
         return $this;

app/code/Magento/Persistent/Test/Unit/Model/SessionTest.php

@@ -91,15 +91,15 @@ public function testAfterDeleteCommit()
     {
         $cookiePath = 'some_path';
         $this->configMock->expects($this->once())->method('getCookiePath')->will($this->returnValue($cookiePath));
-        $cookieMetadataMock = $this->getMockBuilder('Magento\Framework\Stdlib\Cookie\CookieMetadata')
+        $cookieMetadataMock = $this->getMockBuilder('Magento\Framework\Stdlib\Cookie\SensitiveCookieMetadata')
             ->disableOriginalConstructor()
             ->getMock();
         $cookieMetadataMock->expects($this->once())
             ->method('setPath')
             ->with($cookiePath)
             ->will($this->returnSelf());
         $this->cookieMetadataFactoryMock->expects($this->once())
-            ->method('createCookieMetadata')
+            ->method('createSensitiveCookieMetadata')
             ->will($this->returnValue($cookieMetadataMock));
         $this->cookieManagerMock->expects(
             $this->once()

app/code/Magento/Theme/Setup/InstallData.php

@@ -0,0 +1,41 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Theme\Setup;
+
+use Magento\Framework\Setup\InstallDataInterface;
+use Magento\Framework\Setup\ModuleContextInterface;
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Theme\Model\Theme\Registration;
+
+/**
+ * Register themes
+ */
+class InstallData implements InstallDataInterface
+{
+    /**
+     * @var Registration
+     */
+    private $themeRegistration;
+
+    /**
+     * Initialize dependencies
+     *
+     * @param Registration $themeRegistration
+     */
+    public function __construct(Registration $themeRegistration)
+    {
+        $this->themeRegistration = $themeRegistration;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function install(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
+    {
+        $this->themeRegistration->register();
+    }
+}

dev/tests/integration/testsuite/Magento/Setup/Console/Command/_files/expectedPhrases.csv

@@ -15,6 +15,6 @@
 "string with placeholder in double quotes ""%1""","string with placeholder in double quotes ""%1"""
 "string with 'single quotes'","string with 'single quotes'"
 "string with placeholder in single quotes '%1'","string with placeholder in single quotes '%1'"
-"string with escaped \"double quotes\"","string with escaped \"double quotes\""
-"string with placeholder in escaped double quotes \"%1\"","string with placeholder in escaped double quotes \"%1\""
+"string with escaped ""double quotes""","string with escaped ""double quotes"""
+"string with placeholder in escaped double quotes ""%1""","string with placeholder in escaped double quotes ""%1"""
 "string that\'s got an unclosed single quote in it","string that\'s got an unclosed single quote in it"

lib/internal/Magento/Framework/Phrase/Renderer/Translate.php

@@ -49,6 +49,8 @@ public function __construct(
     public function render(array $source, array $arguments)
     {
         $text = end($source);
+        /* If phrase contains escaped double quote then use translation for phrase with non-escaped quote */
+        $text = str_replace('\"', '"', $text);
 
         try {
             $data = $this->translator->getData();

setup/src/Magento/Setup/Module/I18n/Dictionary/Phrase.php

@@ -267,11 +267,14 @@ public function getCompiledTranslation()
     private function getCompiledString($string)
     {
         $encloseQuote = $this->getQuote() == Phrase::QUOTE_DOUBLE ? Phrase::QUOTE_DOUBLE : Phrase::QUOTE_SINGLE;
-        //find all occurrences of ' and ", with no \ before it.
+        /* Find all occurrences of ' and ", with no \ before it for concatenation */
         preg_match_all('/[^\\\\]' . $encloseQuote . '|' . $encloseQuote . '[^\\\\]/', $string, $matches);
         if (count($matches[0])) {
             $string = preg_replace('/([^\\\\])' . $encloseQuote . ' ?\. ?' . $encloseQuote . '/', '$1', $string);
         }
+        /* Remove all occurrences of escaped double quote because it is not desirable in csv file.
+           Translation for such phrases will use translation for phrase without escaped quote. */
+        $string = str_replace('\"', '"', $string);
         return $string;
     }
 }