[Fmsystem-commits] [9849] controller: remove reference to non-existent table

[Sigurd Nes]

Revision: 9849
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9849
Author:   sigurdne
Date:     2012-08-14 10:52:45 +0000 (Tue, 14 Aug 2012)
Log Message:
-----------
controller: remove reference to non-existent table

Modified Paths:
--------------
    trunk/controller/inc/class.soprocedure.inc.php

Modified: trunk/controller/inc/class.soprocedure.inc.php
===================================================================
--- trunk/controller/inc/class.soprocedure.inc.php      2012-08-14 10:42:34 UTC 
(rev 9848)
+++ trunk/controller/inc/class.soprocedure.inc.php      2012-08-14 10:52:45 UTC 
(rev 9849)
@@ -330,7 +330,7 @@
                        $this->db->limit_query($sql, $start, __LINE__, 
__FILE__, $limit);
 
                        while ($this->db->next_record()) {
-                               $procedure = new 
controller_procedure($this->unmarshal($this->db->f('id', true), 'int'));
+                               $procedure = new 
controller_procedure($this->unmarshal($this->db->f('id'), 'int'));
                                
$procedure->set_title($this->unmarshal($this->db->f('title', true), 'string'));
                                
$procedure->set_purpose($this->unmarshal($this->db->f('purpose', true), 
'string'));
                                
$procedure->set_responsibility($this->unmarshal($this->db->f('responsibility', 
true), 'string'));
@@ -353,11 +353,11 @@
                {
                        $results = array();
 
-                       $sql = "SELECT p.*, controller_control_area.title AS 
control_area_name FROM controller_procedure p WHERE procedure_id = {$id} ORDER 
BY end_date DESC";
+                       $sql = "SELECT p.* FROM controller_procedure p WHERE 
procedure_id = {$id} ORDER BY end_date DESC";
                        $this->db->limit_query($sql, $start, __LINE__, 
__FILE__, $limit);
 
                        while ($this->db->next_record()) {
-                               $procedure = new 
controller_procedure($this->unmarshal($this->db->f('id', true), 'int'));
+                               $procedure = new 
controller_procedure($this->unmarshal($this->db->f('id'), 'int'));
                                
$procedure->set_title($this->unmarshal($this->db->f('title', true), 'string'));
                                
$procedure->set_purpose($this->unmarshal($this->db->f('purpose', true), 
'string'));
                                
$procedure->set_responsibility($this->unmarshal($this->db->f('responsibility', 
true), 'string'));