Skip to content

Commit 1119385

Browse files
authored
Remove call to widgets.magentocommerce.com (#5103)
1 parent c21481f commit 1119385

File tree

6 files changed

+9
-6
lines changed

6 files changed

+9
-6
lines changed

app/code/core/Mage/AdminNotification/etc/config.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@
7474
<system>
7575
<adminnotification>
7676
<feed_url>www.openmage.org/Web_Notifications/notifications_v1.rss</feed_url>
77-
<severity_icons_url>widgets.magentocommerce.com/%s/%s.gif</severity_icons_url>
7877
<use_https>1</use_https>
7978
<frequency>1</frequency>
8079
<last_update>0</last_update>

app/code/core/Mage/Adminhtml/Block/Notification/Window.php

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,17 @@
1010
/**
1111
* @package Mage_Adminhtml
1212
*
13+
* @method string getNoticeSeverity()
14+
* @method $this setNoticeSeverity(string $value)
15+
*
1316
* @property string $_aclResourcePath
1417
*/
1518
class Mage_Adminhtml_Block_Notification_Window extends Mage_Adminhtml_Block_Notification_Toolbar
1619
{
1720
/**
1821
* XML path of Severity icons url
22+
*
23+
* @deprecated
1924
*/
2025
public const XML_SEVERITY_ICONS_URL_PATH = 'system/adminnotification/severity_icons_url';
2126

@@ -135,11 +140,10 @@ public function getSeverityIconsUrl()
135140
{
136141
if (is_null($this->_severityIconsUrl)) {
137142
$this->_severityIconsUrl
138-
= (Mage::app()->getFrontController()->getRequest()->isSecure() ? 'https://' : 'http://')
139-
. sprintf(
140-
Mage::getStoreConfig(self::XML_SEVERITY_ICONS_URL_PATH),
141-
Mage::getVersion(),
142-
$this->getNoticeSeverity(),
143+
= sprintf(
144+
'%s/%s.gif',
145+
$this->getSkinUrl('images/severity'),
146+
$this->getSeverityText(),
143147
)
144148
;
145149
}
2.07 KB
Loading
2.16 KB
Loading
2.14 KB
Loading
2.19 KB
Loading

0 commit comments

Comments
 (0)