Skip to content
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

Jump to bottom

Update References to Documentation/Magento Website - Issue #988 #2069

Merged
merged 5 commits into from
May 24, 2022
Merged

Update References to Documentation/Magento Website - Issue #988 #2069

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
53766b4
Removed 404 links to magento.com website
fballiano May 5, 2022
8acaffc
Removed 404 links to magento.com website
fballiano May 5, 2022
a2e1783
removed deprecated and unused code
fballiano May 5, 2022
2910f07
Reintroduced the notification link, taken from archive.org
fballiano May 6, 2022
8a8529e
restored used method and added deprecation notice
fballiano May 10, 2022
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
2 changes: 0 additions & 2 deletions app/Mage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,6 @@ final class Mage

/**
* Gets the current Magento version string
* @link http://www.magentocommerce.com/blog/new-community-edition-release-process/
*
* @return string
*/
Expand All @@ -160,7 +159,6 @@ public static function getVersion()

/**
* Gets the detailed Magento version information
* @link http://www.magentocommerce.com/blog/new-community-edition-release-process/
*
* @return array
*/
Expand Down
48 changes: 2 additions & 46 deletions app/code/core/Mage/AdminNotification/Helper/Data.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,22 +34,6 @@
*/
class Mage_AdminNotification_Helper_Data extends Mage_Core_Helper_Abstract
{
const XML_PATH_POPUP_URL = 'system/adminnotification/popup_url';

/**
* Widget Popup Notification Object URL
*
* @var string
*/
protected $_popupUrl;

/**
* Is readable Popup Notification Object flag
*
* @var bool
*/
protected $_popupReadable;

/**
* Last Notice object
*
Expand Down Expand Up @@ -96,38 +80,10 @@ public function getUnreadNoticeCount($severity)
*
* @param bool $withExt
* @return string
* @deprecated v19.4.16
*/
public function getPopupObjectUrl($withExt = false)
fballiano marked this conversation as resolved.
Show resolved Hide resolved
{
if (is_null($this->_popupUrl)) {
$this->_popupUrl = 'https://' . Mage::getStoreConfig(self::XML_PATH_POPUP_URL);
}
return $this->_popupUrl . ($withExt ? '.swf' : '');
}

/**
* Check is readable Popup Notification Object
* @deprecated after 1.4.2.0
*
* @return bool
*/
public function isReadablePopupObject()
{
if (is_null($this->_popupReadable)) {
$this->_popupReadable = false;
$curl = new Varien_Http_Adapter_Curl();
$curl->setConfig(array(
'timeout' => 2
));
$curl->write(Zend_Http_Client::GET, $this->getPopupObjectUrl(true));
if ($curl->read()) {
if ($curl->getInfo(CURLINFO_HTTP_CODE) == 200) {
$this->_popupReadable = true;
}
}

$curl->close();
}
return $this->_popupReadable;
return '';
luigifab marked this conversation as resolved.
Show resolved Hide resolved
}
}
2 changes: 0 additions & 2 deletions app/code/core/Mage/AdminNotification/etc/config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,6 @@
<system>
<adminnotification>
<feed_url>www.openmage.org/Web_Notifications/notifications_v1.rss</feed_url>
<popup_url>widgets.magentocommerce.com/notificationPopup</popup_url>
<severity_icons_url>widgets.magentocommerce.com/%s/%s.gif</severity_icons_url>
<use_https>1</use_https>
<frequency>1</frequency>
<last_update>0</last_update>
Expand Down
1 change: 1 addition & 0 deletions app/code/core/Mage/Adminhtml/Block/Notification/Window.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ public function canShow()
* Return swf object url
*
* @return string
* @deprecated v19.4.16
*/
public function getObjectUrl()
{
Expand Down
2 changes: 1 addition & 1 deletion app/code/core/Mage/Tax/etc/config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@
<zero_tax>0</zero_tax>
</sales_display>
<notification>
<url>http://www.magentocommerce.com/knowledge-base/entry/magento-ce-18-ee-113-tax-calc</url>
fballiano marked this conversation as resolved.
Show resolved Hide resolved
<url>https://web.archive.org/web/20150315064836/https://www.magentocommerce.com/knowledge-base/entry/magento-ce-18-ee-113-tax-calc</url>
</notification>
</tax>
</default>
Expand Down
2 changes: 1 addition & 1 deletion js/mage/adminhtml/wysiwyg/tiny_mce/plugins/magentovariable/editor_plugin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ tinyMCE.addI18n({en:{
longname : 'Magento Variable Manager Plugin for TinyMCE 3.x',
author : 'Magento Core Team',
authorurl : 'http://magentocommerce.com',
infourl : 'http://magentocommerce.com',
infourl : 'https://www.openmage.org',
version : "1.0"
};
}
Expand Down
2 changes: 1 addition & 1 deletion js/mage/adminhtml/wysiwyg/tiny_mce/plugins/magentowidget/editor_plugin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ tinyMCE.addI18n({en:{
longname : 'Magento Widget Manager Plugin for TinyMCE 3.x',
author : 'Magento Core Team',
authorurl : 'http://magentocommerce.com',
infourl : 'http://magentocommerce.com',
infourl : 'https://www.openmage.org',
version : "1.0"
};
}
Expand Down