[Phpgroupware-cvs] property/inc class.soproject.inc.php,1.13

[sigurdne]

Update of property/inc

Modified Files:
     Branch: MAIN
            class.soproject.inc.php lines: +9 -2

Log Message:
no message

====================================================
Index: property/inc/class.soproject.inc.php
diff -u property/inc/class.soproject.inc.php:1.12 
property/inc/class.soproject.inc.php:1.13
--- property/inc/class.soproject.inc.php:1.12   Wed Feb 23 09:23:33 2005
+++ property/inc/class.soproject.inc.php        Thu Feb 24 10:13:27 2005
@@ -391,8 +391,15 @@
                        return $this->db->f('origin_id');
                }

-               function get_power_meter($location_code = '',$meter_table)
+               function get_power_meter($location_code = '',$meter_table='')
                {
+                       if(!$meter_table)
+                       {
+                               $config = 
CreateObject('phpgwapi.config','property');
+                               $config->read_repository();
+                               $meter_table = 
$config->config_data['meter_table'];
+                       }
+
                        $this->db2->query("SELECT ext_meter_id as power_meter 
FROM $meter_table where location_code='$location_code' and 
category='1'",__LINE__,__FILE__);

                        $this->db2->next_record();