[Gemstracker-svn] SF.net SVN: gemstracker:[431] branches/1.5.x

[<gem...@li...>]

Revision: 431
          http://gemstracker.svn.sourceforge.net/gemstracker/?rev=431&view=rev
Author:   michieltcs
Date:     2012-01-30 13:36:35 +0000 (Mon, 30 Jan 2012)
Log Message:
-----------
Merge r351 from branch 1.5.0-pulse

Revision Links:
--------------
    http://gemstracker.svn.sourceforge.net/gemstracker/?rev=351&view=rev

Modified Paths:
--------------
    branches/1.5.x/library/classes/Gems/User/OldStaffUserDefinition.php

Property Changed:
----------------
    branches/1.5.x/


Property changes on: branches/1.5.x
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.5.0-pulse:306-342,344,346
/tags/1.5.0beta1:305
   + /branches/1.5.0-pulse:306-430
/tags/1.5.0beta1:305

Modified: branches/1.5.x/library/classes/Gems/User/OldStaffUserDefinition.php
===================================================================
--- branches/1.5.x/library/classes/Gems/User/OldStaffUserDefinition.php	2012-01-30 10:04:25 UTC (rev 430)
+++ branches/1.5.x/library/classes/Gems/User/OldStaffUserDefinition.php	2012-01-30 13:36:35 UTC (rev 431)
@@ -111,6 +111,7 @@
                 $this->db->update('gems__staff', $values, $this->db->quoteInto('gsf_id_user = ?', $staff_id));
 
             } catch (Zend_Db_Exception $e) {
+                GemsEscort::getInstance()->logger->log($e->getMessage(), Zend_Log::ERR);
                 // Fall through as this does not work if the database upgrade did not run
                 // MUtil_Echo::r($e);
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.