Fixed null parameter warning in Mage_Adminhtml_Block_Newsletter_Template_Edit::getJsTemplateName() (#3820)

fballiano · web-flow · commit ad6b3c59d01c · 2024-02-09T08:59:24.000Z
diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Edit.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Edit.php
@@ -261,13 +261,15 @@ public function getForm()
     }
 
     /**
-     * Return return template name for JS
-     *
      * @return string
      */
     public function getJsTemplateName()
     {
-        return addcslashes($this->escapeHtml($this->getModel()->getTemplateCode()), "\"\r\n\\");
+        $templateCode = $this->getModel()->getTemplateCode();
+        if ($templateCode === null) {
+            return '';
+        }
+        return addcslashes($this->escapeHtml($templateCode), "\"\r\n\\");
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -261,13 +261,15 @@ public function getForm()`
`261`	`261`	`}`
`262`	`262`
`263`	`263`	`/**`
`264`		`- * Return return template name for JS`
`265`		`- *`
`266`	`264`	`* @return string`
`267`	`265`	`*/`
`268`	`266`	`public function getJsTemplateName()`
`269`	`267`	`{`
`270`		`- return addcslashes($this->escapeHtml($this->getModel()->getTemplateCode()), "\"\r\n\\");`
	`268`	`+ $templateCode = $this->getModel()->getTemplateCode();`
	`269`	`+ if ($templateCode === null) {`
	`270`	`+ return '';`
	`271`	`+ }`
	`272`	`+ return addcslashes($this->escapeHtml($templateCode), "\"\r\n\\");`
`271`	`273`	`}`
`272`	`274`
`273`	`275`	`/**`