MAGETWO-70628: Missing link to reset password in forgot your password email

Author: omiroshnichenko

app/code/Magento/Customer/Model/EmailNotification.php

@@ -60,13 +60,6 @@ class EmailNotification implements EmailNotificationInterface
         self::NEW_ACCOUNT_EMAIL_CONFIRMATION => self::XML_PATH_CONFIRM_EMAIL_TEMPLATE,
     ];
 
-    /**
-     * Map of templates. Use for backward compatibility
-     */
-    const TEMPLATE_MAP = [
-        self::XML_PATH_FORGOT_EMAIL_TEMPLATE => self::XML_PATH_RESET_PASSWORD_TEMPLATE
-    ];
-
     /**#@-*/
 
     /**
@@ -248,7 +241,7 @@ private function sendEmailTemplate(
         $storeId = null,
         $email = null
     ) {
-        $templateId = $this->getTemplateId($template, 'store', $storeId);
+        $templateId = $this->scopeConfig->getValue($template, 'store', $storeId);
         if ($email === null) {
             $email = $customer->getEmail();
         }
@@ -384,23 +377,4 @@ public function newAccount(
             $storeId
         );
     }
-
-    /**
-     * Get templateId include considering template map
-     *
-     * @param string $template
-     * @param string $scopeType
-     * @param string $storeId
-     * @return string
-     */
-    private function getTemplateId($template, $scopeType, $storeId)
-    {
-        if (array_key_exists($template, self::TEMPLATE_MAP)) {
-            $templateId = $this->scopeConfig->getValue(self::TEMPLATE_MAP[$template], $scopeType, $storeId);
-            if ($templateId) {
-                return $templateId;
-            }
-        }
-        return $this->scopeConfig->getValue($template, $scopeType, $storeId);
-    }
 }