[Fmsystem-commits] [10218] Merge 10166:10210 from trunk

[Sigurd Nes]

Revision: 10218
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10218
Author:   sigurdne
Date:     2012-10-15 10:39:54 +0000 (Mon, 15 Oct 2012)
Log Message:
-----------
Merge 10166:10210 from trunk

Modified Paths:
--------------
    branches/Version-1_0-branch/controller/inc/class.socontrol.inc.php

Modified: branches/Version-1_0-branch/controller/inc/class.socontrol.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.socontrol.inc.php  
2012-10-15 10:39:17 UTC (rev 10217)
+++ branches/Version-1_0-branch/controller/inc/class.socontrol.inc.php  
2012-10-15 10:39:54 UTC (rev 10218)
@@ -66,7 +66,6 @@
 
                        if($result)
                        {
-
                                // Set the new control ID
                                
$control->set_id($this->db->get_last_insert_id('controller_control', 'id'));