fix: Correct the use of GetContacts() #5012 #6059

Merged
merged 4 commits into from Mar 8, 2017

Conversation

Projects
None yet
5 participants
@laf
Member

laf commented Mar 2, 2017

DO NOT DELETE THIS TEXT

Please note

Please read this information carefully. You can run ./scripts/pre-commit.php to check your code before submitting.

  • Have you signed the Contributors agreement - please do NOT submit a pull request unless you have (signing the agreement in the same pull request is fine). Your commit message for signing the agreement must appear as per the docs.
  • Have you followed our code guidelines?

Testers

If you would like to test this pull request then please run: ./scripts/github-apply <pr_id>, i.e ./scripts/github-apply 5926

Possibility that this fixes #5012

@mention-bot

This comment has been minimized.

Show comment
Hide comment
@mention-bot

mention-bot Mar 2, 2017

Thank you for submitting a PR @laf! We have found the following @murrant, @f0o and @InsaneSplash based on the history of these files to review this PR.

Thank you for submitting a PR @laf! We have found the following @murrant, @f0o and @InsaneSplash based on the history of these files to review this PR.

@LibreNMS-CI

This comment has been minimized.

Show comment
Hide comment
html/includes/output/query.inc.php
@@ -43,7 +43,7 @@
$rule['query'] = GenSQL($rule['rule']);
}
$sql = $rule['query'];
- $qry = dbFetchRow($sql, array($device_id));
+ $qry[] = dbFetchRow($sql, array($device_id));

This comment has been minimized.

@murrant

murrant Mar 7, 2017

Member

Won't this work better $qry = dbFetchRows($sql, array($device_id));?
Row->Rows

@murrant

murrant Mar 7, 2017

Member

Won't this work better $qry = dbFetchRows($sql, array($device_id));?
Row->Rows

This comment has been minimized.

@laf

laf Mar 7, 2017

Member

No, $qry is passed later on and needs to be an array, the $sql is a single row lookup but we're in a loop so need to build that $qry array up.

@laf

laf Mar 7, 2017

Member

No, $qry is passed later on and needs to be an array, the $sql is a single row lookup but we're in a loop so need to build that $qry array up.

html/includes/output/query.inc.php
@@ -43,7 +43,7 @@
$rule['query'] = GenSQL($rule['rule']);
}
$sql = $rule['query'];
- $qry = dbFetchRow($sql, array($device_id));
+ $qry[] = dbFetchRow($sql, array($device_id));
if (is_array($qry)) {

This comment has been minimized.

@murrant

murrant Mar 7, 2017

Member

This is now always true.

@murrant

murrant Mar 7, 2017

Member

This is now always true.

This comment has been minimized.

@laf

laf Mar 7, 2017

Member

Updated

@laf

laf Mar 7, 2017

Member

Updated

@LibreNMS-CI

This comment has been minimized.

Show comment
Hide comment
@LibreNMS-CI

This comment has been minimized.

Show comment
Hide comment
@LibreNMS-CI

This comment has been minimized.

Show comment
Hide comment
@scrutinizer-notifier

This comment has been minimized.

Show comment
Hide comment
@scrutinizer-notifier

scrutinizer-notifier Mar 8, 2017

The inspection completed: No new issues

The inspection completed: No new issues

@murrant murrant merged commit b30161b into librenms:master Mar 8, 2017

2 checks passed

Auto-Deploy Build finished.
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

@laf laf deleted the laf:issue-5012 branch Mar 8, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment