Skip to content

Fixed "if newsletter module disabled, customer backend would blank without notice" #3078

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 13, 2023
Merged

Fixed "if newsletter module disabled, customer backend would blank without notice" #3078

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tabs.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,13 +73,15 @@ protected function _beforeToHtml()
'url' => $this->getUrl('*/*/wishlist', ['_current' => true]),
]);

/** @var Mage_Adminhtml_Block_Customer_Edit_Tab_Newsletter $block */
$block = $this->getLayout()->createBlock('adminhtml/customer_edit_tab_newsletter');
if (Mage::getSingleton('admin/session')->isAllowed('newsletter/subscriber')) {
$this->addTab('newsletter', [
'label' => Mage::helper('customer')->__('Newsletter'),
'content' => $block->initForm()->toHtml()
]);
if (Mage::helper('core')->isModuleOutputEnabled('Mage_Newsletter')) {
/** @var Mage_Adminhtml_Block_Customer_Edit_Tab_Newsletter $block */
$block = $this->getLayout()->createBlock('adminhtml/customer_edit_tab_newsletter');
if (Mage::getSingleton('admin/session')->isAllowed('newsletter/subscriber')) {
$this->addTab('newsletter', [
'label' => Mage::helper('customer')->__('Newsletter'),
'content' => $block->initForm()->toHtml()
]);
}
}

if (Mage::getSingleton('admin/session')->isAllowed('catalog/reviews_ratings')) {
Expand Down
29 changes: 17 additions & 12 deletions app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Giftmessage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,14 @@ public function getOrder()
*/
protected function _beforeToHtml()
{
if ($this->getParentBlock() && ($order = $this->getOrder())) {
$this->setEntity($order);
if (Mage::helper('core')->isModuleOutputEnabled('Mage_Giftmessage')) {
if ($this->getParentBlock() && ($order = $this->getOrder())) {
$this->setEntity($order);
}
return parent::_beforeToHtml();
} else {
return parent::_beforeToHtml();
}
return parent::_beforeToHtml();
}

/**
Expand All @@ -63,15 +67,16 @@ protected function _beforeToHtml()
*/
protected function _prepareLayout()
{
$this->setChild(
'save_button',
$this->getLayout()->createBlock('adminhtml/widget_button')
->setData([
'label' => Mage::helper('giftmessage')->__('Save Gift Message'),
'class' => 'save'
])
);

if (Mage::helper('core')->isModuleOutputEnabled('Mage_Giftmessage')) {
$this->setChild(
'save_button',
$this->getLayout()->createBlock('adminhtml/widget_button')
->setData([
'label' => Mage::helper('giftmessage')->__('Save Gift Message'),
'class' => 'save'
])
);
}
return $this;
}

Expand Down
4 changes: 1 addition & 3 deletions app/etc/modules/Mage_Captcha.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,7 @@
<codePool>core</codePool>
<depends>
<Mage_Adminhtml/>
<Mage_Customer/>
<Mage_Sendfriend/>
<Mage_Wishlist/>
<Mage_Customer/>
</depends>
</Mage_Captcha>
</modules>
Expand Down
8 changes: 7 additions & 1 deletion lib/Varien/Data/Form/Abstract.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,13 @@ public function addField($elementId, $type, $config, $after = false)
} else {
$className = 'Varien_Data_Form_Element_' . ucfirst(strtolower($type));
}
$element = new $className($config);

if (class_exists($className)) {
$element = new $className($config);
} else {
$className = 'Varien_Data_Form_Element_Note';
$element = new $className($config);
}
$element->setId($elementId);
$this->addElement($element, $after);
return $element;
Expand Down