Merge branch '2014.11' into 2015.11

[tine20] / tine20 / Admin / Controller / User.php

diff --git a/tine20/Admin/Controller/User.php b/tine20/Admin/Controller/User.php
index 1ff0492..c513ecd 100644 (file)
--- a/tine20/Admin/Controller/User.php
+++ b/tine20/Admin/Controller/User.php
@@ -284,8 +284,7 @@ class Admin_Controller_User extends Tinebase_Controller_Abstract
 
         } catch (Exception $e) {
             Tinebase_TransactionManager::getInstance()->rollBack();
 
         } catch (Exception $e) {
             Tinebase_TransactionManager::getInstance()->rollBack();

-            Tinebase_Core::getLogger()->err(__METHOD__ . '::' . __LINE__ . ' ' . $e->getMessage());
-            if (Tinebase_Core::isLogLevel(Zend_Log::DEBUG)) Tinebase_Core::getLogger()->debug(__METHOD__ . '::' . __LINE__ . ' ' . $e->getTraceAsString());
+            Tinebase_Exception::log($e);

             throw $e;
         }
         
             throw $e;
         }