From 43e316e7f67e43632d8791d6dab98009be4a47d4 Mon Sep 17 00:00:00 2001
From: Adam Amstrong <adama@localhost>
Date: Thu, 5 May 2011 20:37:54 +0000
Subject: [PATCH] fix global $device

git-svn-id: http://www.observium.org/svn/observer/trunk@2260 61d68cd4-352d-0410-923a-c4978735b2b8
---
 discovery.php | 4 +---
 poller.php    | 1 +
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/discovery.php b/discovery.php
index 25019bc1b..ac86b23e6 100755
--- a/discovery.php
+++ b/discovery.php
@@ -160,6 +160,7 @@ function discover_device($device, $options)
 {
 
   global $config;
+  global $device;
   global $valid; $valid = array(); ## Reset $valid array
 
   $attribs = get_dev_attribs($device['device_id']);
@@ -181,10 +182,7 @@ function discover_device($device, $options)
 
   echo("\n");
 
-  #include("includes/discovery/os.inc.php");
-
   ### If we've specified a module, use that, else walk the modules array
-
   if ($options['m'])
   {
     if (is_file("includes/discovery/".$options['m'].".inc.php"))
diff --git a/poller.php b/poller.php
index 877cbecd0..c0e6f54b4 100755
--- a/poller.php
+++ b/poller.php
@@ -107,6 +107,7 @@ while ($device = mysql_fetch_assoc($device_query))
 function poll_device($device, $options) {
 
   global $config;
+  global $device;
 
   $attribs = get_dev_attribs($device['device_id']);