[Fmsystem-commits] [7307]

[Erik Holm-Larsen]

Revision: 7307
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7307
Author:   erikhl
Date:     2011-05-26 08:30:19 +0000 (Thu, 26 May 2011)
Log Message:
-----------


Modified Paths:
--------------
    trunk/activitycalendar/inc/class.uiimport.inc.php

Modified: trunk/activitycalendar/inc/class.uiimport.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.uiimport.inc.php   2011-05-26 08:25:14 UTC 
(rev 7306)
+++ trunk/activitycalendar/inc/class.uiimport.inc.php   2011-05-26 08:30:19 UTC 
(rev 7307)
@@ -202,9 +202,6 @@
                        $this->messages[] = "'importfile.csv' contained " . 
count($datalines) . " lines";
                        
                        //$so_arena = rental_socontract::get_instance();
-                       $db_arena = $soarena->get_db();
-                       $db_arena->transaction_begin();
-                       
                        $db_activity = $soactivity->get_db();
                        $db_activity->transaction_begin();
                        
@@ -333,7 +330,6 @@
                        if($arenaOK && $activityOK)
                        {
                                $this->messages[] = "Imported activities. (" . 
(time() - $start_time) . " seconds)";
-                               $db_arena->transaction_commit();
                                $db_activity->transaction_commit();
                                return true;
                        }
@@ -351,7 +347,6 @@
                                {
                                        $this->messages[] = "Import of 
activities/arenas failed. (" . (time() - $start_time) . " seconds)";
                                }
-                               $db_arena->transaction_abort();
                                $db_activity->transaction_abort();
                                return false;
                        }