Merge pull request magento#4175 from magento-obsessive-owls/MAGETWO-9…

…8917
ankurvr · May 21, 2019 · c813d90 · c813d90
2 parents e9c3af9 + 23bfcfe
commit c813d90
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 8 deletions.
diff --git a/app/code/Magento/Cms/Block/Block.php b/app/code/Magento/Cms/Block/Block.php
@@ -13,6 +13,11 @@
  */
 class Block extends AbstractBlock implements \Magento\Framework\DataObject\IdentityInterface
 {
+    /**
+     * Prefix for cache key of CMS block
+     */
+    const CACHE_KEY_PREFIX = 'CMS_BLOCK_';
+
     /**
      * @var \Magento\Cms\Model\Template\FilterProvider
      */

diff --git a/app/code/Magento/SendFriend/etc/adminhtml/system.xml b/app/code/Magento/SendFriend/etc/adminhtml/system.xml
@@ -13,8 +13,11 @@
             <resource>Magento_Config::sendfriend</resource>
             <group id="email" translate="label" type="text" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label>Email Templates</label>
-                <field id="enabled" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                <field id="enabled" translate="label comment" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Enabled</label>
+                    <comment>
+                        <![CDATA[We strongly recommend to install a <a href="https://devdocs.magento.com/guides/v2.2/security/google-recaptcha.html" target="_blank">CAPTCHA solution</a> alongside enabling "Email to a Friend" to ensure abuse of this feature does not occur.]]>
+                    </comment>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 </field>
                 <field id="template" translate="label comment" type="select" sortOrder="2" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">

diff --git a/app/code/Magento/SendFriend/etc/config.xml b/app/code/Magento/SendFriend/etc/config.xml
@@ -9,7 +9,7 @@
     <default>
         <sendfriend>
             <email>
-                <enabled>1</enabled>
+                <enabled>0</enabled>
                 <template>sendfriend_email_template</template>
                 <allow_guest>0</allow_guest>
                 <max_recipients>5</max_recipients>

diff --git a/app/code/Magento/SendFriend/i18n/en_US.csv b/app/code/Magento/SendFriend/i18n/en_US.csv
@@ -45,3 +45,4 @@ Enabled,Enabled
 "Max Recipients","Max Recipients"
 "Max Products Sent in 1 Hour","Max Products Sent in 1 Hour"
 "Limit Sending By","Limit Sending By"
+"We strongly recommend to install a <a href=""https://devdocs.magento.com/guides/v2.2/security/google-recaptcha.html"" target="_blank">CAPTCHA solution</a> alongside enabling ""Email to a Friend"" to ensure abuse of this feature does not occur.","We strongly recommend to install a <a href=""https://devdocs.magento.com/guides/v2.2/security/google-recaptcha.html"" target="_blank">CAPTCHA solution</a> alongside enabling ""Email to a Friend"" to ensure abuse of this feature does not occur."
diff --git a/composer.lock b/composer.lock
diff --git a/...ests/integration/testsuite/Magento/SendFriend/Controller/Product/CustomerSendmailTest.php b/...ests/integration/testsuite/Magento/SendFriend/Controller/Product/CustomerSendmailTest.php
@@ -17,6 +17,9 @@
 use Magento\Framework\Message\MessageInterface;
 use Magento\Captcha\Helper\Data as CaptchaHelper;
 
+/**
+ * Class CustomerSendmailTest
+ */
 class CustomerSendmailTest extends AbstractController
 {
     /**
@@ -58,6 +61,7 @@ protected function setUp()
     }
 
     /**
+     * @magentoConfigFixture default_store sendfriend/email/enabled 1
      * @magentoDataFixture Magento/Customer/_files/customer.php
      * @magentoDataFixture Magento/Catalog/_files/product_simple.php
      */
@@ -95,6 +99,7 @@ public function testExecute()
      * @magentoDataFixture Magento/Customer/_files/customer.php
      * @magentoDataFixture Magento/Catalog/_files/product_simple.php
      * @magentoConfigFixture default_store customer/captcha/forms product_sendtofriend_form
+     * @magentoConfigFixture default_store sendfriend/email/enabled 1
      */
     public function testWithCaptchaFailed()
     {
@@ -130,7 +135,7 @@ public function testWithCaptchaFailed()
      * @magentoDataFixture Magento/Customer/_files/customer.php
      * @magentoDataFixture Magento/Catalog/_files/product_simple.php
      * @magentoConfigFixture default_store customer/captcha/forms product_sendtofriend_form
-     *
+     * @magentoConfigFixture default_store sendfriend/email/enabled 1
      */
     public function testWithCaptchaSuccess()
     {

diff --git a/dev/tests/integration/testsuite/Magento/SendFriend/Controller/SendmailTest.php b/dev/tests/integration/testsuite/Magento/SendFriend/Controller/SendmailTest.php
@@ -26,6 +26,7 @@ class SendmailTest extends AbstractController
      *
      * @magentoDbIsolation enabled
      * @magentoAppIsolation enabled
+     * @magentoConfigFixture default_store sendfriend/email/enabled 1
      * @magentoDataFixture Magento/SendFriend/_files/disable_allow_guest_config.php
      * @magentoDataFixture Magento/Customer/_files/customer.php
      * @magentoDataFixture Magento/Catalog/_files/products.php

diff --git a/lib/internal/Magento/Framework/Filter/Template.php b/lib/internal/Magento/Framework/Filter/Template.php
@@ -72,6 +72,7 @@ class Template implements \Zend_Filter_Interface
         'gettemplateprocessor',
         'vardirective',
         'delete',
+        'getdatausingmethod'
     ];
 
     /**

diff --git a/lib/internal/Magento/Framework/Filter/Test/Unit/TemplateTest.php b/lib/internal/Magento/Framework/Filter/Test/Unit/TemplateTest.php
@@ -259,6 +259,7 @@ public function disallowedMethods(): array
             ['getTemplateProcessor'],
             ['varDirective'],
             ['delete'],
+            ['getDataUsingMethod']
         ];
     }