Skip to content

Commit 74047b7

Browse files
committed
Merge pull request #58 from max-mi/master
Fix PHP Warnings/Notices
2 parents d118dd9 + eb351bd commit 74047b7

File tree

6 files changed

+7
-10
lines changed

6 files changed

+7
-10
lines changed

src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Create/Customer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public function getHeaderText()
2929
return Mage::helper('zendesk')->__('Please Select User to Add');
3030
}
3131

32-
public function getButtonsHtml()
32+
public function getButtonsHtml($area = null)
3333
{
3434
$addButtonData = array(
3535
'label' => Mage::helper('zendesk')->__('Select User'),

src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Create/Order.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public function getHeaderText()
2929
return Mage::helper('zendesk')->__('Please Select Order to Add');
3030
}
3131

32-
public function getButtonsHtml()
32+
public function getButtonsHtml($area = null)
3333
{
3434
$addButtonData = array(
3535
'label' => Mage::helper('zendesk')->__('Select Order'),

src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Dashboard/Tab/Tickets/Grid/Renderer/Email.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
class Zendesk_Zendesk_Block_Adminhtml_Dashboard_Tab_Tickets_Grid_Renderer_Email extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Abstract {
2020

2121
public function render(Varien_Object $row) {
22-
$users = Mage::registry('zendesk_users');
22+
$users = Mage::registry('zendesk_users') ? Mage::registry('zendesk_users') : array();
2323
$value = (int) $row->getData($this->getColumn()->getIndex());
2424

2525
$found = array_filter($users, function($user) use($value) {

src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Dashboard/Tab/Tickets/Grid/Renderer/User.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
class Zendesk_Zendesk_Block_Adminhtml_Dashboard_Tab_Tickets_Grid_Renderer_User extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Abstract {
2020

2121
public function render(Varien_Object $row) {
22-
$users = Mage::registry('zendesk_users');
22+
$users = Mage::registry('zendesk_users') ? Mage::registry('zendesk_users') : array();
2323
$value = (int) $row->getData($this->getColumn()->getIndex());
2424

2525
$found = array_filter($users, function($user) use($value) {

src/app/code/community/Zendesk/Zendesk/Model/Api/Requesters.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
class Zendesk_Zendesk_Model_Api_Requesters extends Zendesk_Zendesk_Model_Api_Users
1919
{
20-
public function create($email, $name)
20+
public function create($email, $name = null)
2121
{
2222
if(!Zend_Validate::is($email, 'EmailAddress')) {
2323
throw new InvalidArgumentException('Invalid email address provided');

src/app/code/community/Zendesk/Zendesk/Model/Resource/Tickets/Collection.php

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -132,9 +132,7 @@ public function getCollection(array $params = array()) {
132132

133133
public function getCollectionFromView($viewId, array $params = array()) {
134134
$view = Mage::getModel('zendesk/api_views')->execute($viewId, $params);
135-
136-
// Loop through the rows if the view is found and active
137-
if (!empty($view)) {
135+
if (is_array($view['rows'])) {
138136
foreach ($view['rows'] as $row) {
139137
$ticket = array_merge($row, $row['ticket']);
140138

@@ -144,10 +142,9 @@ public function getCollectionFromView($viewId, array $params = array()) {
144142
$obj->setData($ticket);
145143
$this->addItem($obj);
146144
}
147-
148-
$this->_viewColumns = $view['columns'];
149145
}
150146

147+
$this->_viewColumns = $view['columns'] ? $view['columns'] : array();
151148

152149
$this->setPageSize($params['per_page']);
153150
$this->setCurPage($params['page']);

0 commit comments

Comments
 (0)