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.

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

CRM-20589, fixed strict warning: Non-static method #10365

Merged
merged 1 commit into from
May 22, 2017
Merged
Changes from all commits
Commits
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
7 changes: 4 additions & 3 deletions CRM/Batch/BAO/Batch.php
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ public static function deleteBatch($batchId) {
* @return array
* associated array of batch list
*/
public function getBatchListSelector(&$params) {
public static function getBatchListSelector(&$params) {
// format the params
$params['offset'] = ($params['page'] - 1) * $params['rp'];
$params['rowCount'] = $params['rp'];
Expand Down Expand Up @@ -274,11 +274,12 @@ public static function getBatchList(&$params) {
{$limit}";

$object = CRM_Core_DAO::executeQuery($query, $params, TRUE, 'CRM_Batch_DAO_Batch');
$obj = new CRM_Batch_BAO_Batch();
if (!empty($params['context'])) {
$links = self::links($params['context']);
$links = $obj->links($params['context']);
}
else {
$links = self::links();
$links = $obj->links();
}

$batchTypes = CRM_Core_PseudoConstant::get('CRM_Batch_DAO_Batch', 'type_id');
Expand Down