[icinga-checkins] icinga.org: icingaweb2-module-director/master: Sync: remove forgotten $db' s

git at icinga.org git at icinga.org
Tue Feb 23 13:04:08 CET 2016


Module: icingaweb2-module-director
Branch: master
Commit: ff7e2433706005b6716c0b8449dac77181118d3c
URL:    https://git.icinga.org/?p=icingaweb2-module-director.git;a=commit;h=ff7e2433706005b6716c0b8449dac77181118d3c

Author: Thomas Gelf <thomas at gelf.net>
Date:   Tue Feb 23 11:59:25 2016 +0100

Sync: remove forgotten $db's

---

 library/Director/Import/Sync.php |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/library/Director/Import/Sync.php b/library/Director/Import/Sync.php
index b0e095f..76f304f 100644
--- a/library/Director/Import/Sync.php
+++ b/library/Director/Import/Sync.php
@@ -435,13 +435,12 @@ class Sync
     protected function prepare()
     {
         $rule = $this->rule;
-        $db = $this->db;
         $properties = $rule->fetchSyncProperties();
-        $sources    = $this->perpareImportSources($properties, $db);
-        $imported   = $this->fetchImportedData($sources, $properties, $rule, $db);
+        $sources    = $this->perpareImportSources($properties);
+        $imported   = $this->fetchImportedData($sources, $properties);
 
         // TODO: Make object_type (template, object...) and object_name mandatory?
-        $objects = IcingaObject::loadAllByType($rule->object_type, $db);
+        $objects = IcingaObject::loadAllByType($rule->object_type, $this->db);
 
         // TODO: should be obsoleted by a better "loadFiltered" method
         if ($rule->object_type === 'datalistEntry') {



More information about the icinga-checkins mailing list