[Fmsystem-commits] [10246]

[Torstein]

Revision: 10246
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10246
Author:   vator
Date:     2012-10-17 08:46:47 +0000 (Wed, 17 Oct 2012)
Log Message:
-----------


Modified Paths:
--------------
    trunk/logistic/inc/class.sorequirement.inc.php

Modified: trunk/logistic/inc/class.sorequirement.inc.php
===================================================================
--- trunk/logistic/inc/class.sorequirement.inc.php      2012-10-17 08:46:47 UTC 
(rev 10245)
+++ trunk/logistic/inc/class.sorequirement.inc.php      2012-10-17 08:46:47 UTC 
(rev 10246)
@@ -150,8 +150,6 @@
 
                        $condition =  join(' AND ', $clauses);
 
-                       //$joins = " {$this->left_join} controller_control_area 
ON (controller_procedure.control_area_id = controller_control_area.id)";
-
                        $tables = "lg_requirement requirement";
 
                        if($return_count) // We should only return a count
@@ -165,7 +163,7 @@
 
                        $dir = $ascending ? 'ASC' : 'DESC';
                        $order = $sort_field ? "ORDER BY 
{$this->marshal($sort_field, 'field')} $dir ": '';
-
+                       
                        return "SELECT {$cols} FROM {$tables} {$joins} WHERE 
{$condition} {$order}";
                }