Skip to content

Commit 838e84c

Browse files
luigifabspinsch
authored andcommitted
Trim trailing whitespace (OpenMage#1834)
1 parent 97eaed4 commit 838e84c

File tree

139 files changed

+311
-311
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

139 files changed

+311
-311
lines changed

app/code/core/Mage/Admin/Model/Acl.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,25 +43,25 @@ class Mage_Admin_Model_Acl extends Zend_Acl
4343
*
4444
*/
4545
const ROLE_TYPE_GROUP = 'G';
46-
46+
4747
/**
4848
* All the user roles are prepended by U
4949
*
5050
*/
5151
const ROLE_TYPE_USER = 'U';
52-
52+
5353
/**
5454
* Permission level to deny access
5555
*
5656
*/
5757
const RULE_PERM_DENY = 0;
58-
58+
5959
/**
6060
* Permission level to inheric access from parent role
6161
*
6262
*/
6363
const RULE_PERM_INHERIT = 1;
64-
64+
6565
/**
6666
* Permission level to allow access
6767
*
@@ -80,7 +80,7 @@ protected function _getRoleRegistry()
8080
}
8181
return $this->_roleRegistry;
8282
}
83-
83+
8484
/**
8585
* Add parent to role object
8686
*

app/code/core/Mage/Admin/Model/Acl/Resource.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,5 +34,5 @@
3434
*/
3535
class Mage_Admin_Model_Acl_Resource extends Zend_Acl_Resource
3636
{
37-
37+
3838
}

app/code/core/Mage/Admin/Model/Acl/Role/Group.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,5 +34,5 @@
3434
*/
3535
class Mage_Admin_Model_Acl_Role_Group extends Mage_Admin_Model_Acl_Role_Generic
3636
{
37-
37+
3838
}

app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tabs.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ protected function _beforeToHtml()
5858
'title' => Mage::helper('catalog')->__('Manage Label / Options'),
5959
'content' => $this->getLayout()->createBlock('adminhtml/catalog_product_attribute_edit_tab_options')->toHtml(),
6060
));
61-
61+
6262
/*if ('select' == $model->getFrontendInput()) {
6363
$this->addTab('options_section', array(
6464
'label' => Mage::helper('catalog')->__('Options Control'),

app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ protected function _getHelper()
8383
{
8484
return $this->helper('adminhtml/catalog_product_edit_action_attribute');
8585
}
86-
86+
8787
/**
8888
* Retrieve back button html code
8989
*
@@ -123,7 +123,7 @@ public function getSaveUrl()
123123
{
124124
return $this->getUrl('*/*/save', array('store'=>Mage::helper('adminhtml/catalog_product_edit_action_attribute')->getSelectedStoreId()));
125125
}
126-
126+
127127
/**
128128
* Get validation url
129129
*

app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Image.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ protected function _getUrl()
4141
}
4242
return $url;
4343
}
44-
44+
4545
protected function _getDeleteCheckbox()
4646
{
4747
$html = '';

app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Edit/Form.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ protected function _prepareForm()
104104
'label' => Mage::helper('newsletter')->__('Sender Name'),
105105
'title' => Mage::helper('newsletter')->__('Sender Name'),
106106
'required' => true,
107-
'value' => $model->getId() !== null
107+
'value' => $model->getId() !== null
108108
? $model->getTemplateSenderName()
109109
: $identityName,
110110
));
@@ -115,7 +115,7 @@ protected function _prepareForm()
115115
'title' => Mage::helper('newsletter')->__('Sender Email'),
116116
'class' => 'validate-email',
117117
'required' => true,
118-
'value' => $model->getId() !== null
118+
'value' => $model->getId() !== null
119119
? $model->getTemplateSenderEmail()
120120
: $identityEmail
121121
));

app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Grid/Renderer/Sender.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,21 +31,21 @@
3131
* @package Mage_Adminhtml
3232
* @author Magento Core Team <[email protected]>
3333
*/
34-
34+
3535
class Mage_Adminhtml_Block_Newsletter_Template_Grid_Renderer_Sender extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Abstract
3636
{
3737
public function render(Varien_Object $row)
3838
{
3939
$str = '';
4040
if($row->getTemplateSenderName()) {
4141
$str .= $this->escapeHtml($row->getTemplateSenderName()) . ' ';
42-
}
42+
}
4343
if($row->getTemplateSenderEmail()) {
4444
$str .= '[' .$this->escapeHtml($row->getTemplateSenderEmail()) . ']';
45-
}
45+
}
4646
if($str == '') {
4747
$str .= '---';
48-
}
48+
}
4949
return $str;
5050
}
5151
}

app/code/core/Mage/Adminhtml/Block/Promo/Quote.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,6 @@ public function __construct()
4141
$this->_headerText = Mage::helper('salesrule')->__('Shopping Cart Price Rules');
4242
$this->_addButtonLabel = Mage::helper('salesrule')->__('Add New Rule');
4343
parent::__construct();
44-
44+
4545
}
4646
}

app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Form.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public function __construct()
4141
$this->setId('promo_quote_form');
4242
$this->setTitle(Mage::helper('salesrule')->__('Rule Information'));
4343
}
44-
44+
4545
protected function _prepareForm()
4646
{
4747
$form = new Varien_Data_Form(array('id' => 'edit_form', 'action' => $this->getData('action'), 'method' => 'post'));

0 commit comments

Comments
 (0)