--- a/web/lib/Zend/Auth/Adapter/DbTable.php	Thu Mar 21 17:31:31 2013 +0100
+++ b/web/lib/Zend/Auth/Adapter/DbTable.php	Thu Mar 21 19:50:53 2013 +0100
@@ -15,9 +15,9 @@
  * @category   Zend
  * @package    Zend_Auth
  * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: DbTable.php 22613 2010-07-17 13:43:22Z dragonbe $
+ * @version    $Id: DbTable.php 24593 2012-01-05 20:35:02Z matthew $
  */
 
 
@@ -41,7 +41,7 @@
  * @category   Zend
  * @package    Zend_Auth
  * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Auth_Adapter_DbTable implements Zend_Auth_Adapter_Interface
@@ -114,12 +114,12 @@
      * @var array
      */
     protected $_resultRow = null;
-    
+
     /**
-     * $_ambiguityIdentity - Flag to indicate same Identity can be used with 
+     * $_ambiguityIdentity - Flag to indicate same Identity can be used with
      * different credentials. Default is FALSE and need to be set to true to
      * allow ambiguity usage.
-     * 
+     *
      * @var boolean
      */
     protected $_ambiguityIdentity = false;
@@ -159,7 +159,7 @@
     /**
      * _setDbAdapter() - set the database adapter to be used for quering
      *
-     * @param Zend_Db_Adapter_Abstract 
+     * @param Zend_Db_Adapter_Abstract
      * @throws Zend_Auth_Adapter_Exception
      * @return Zend_Auth_Adapter_DbTable
      */
@@ -178,7 +178,7 @@
                 throw new Zend_Auth_Adapter_Exception('No database adapter present');
             }
         }
-        
+
         return $this;
     }
 
@@ -265,12 +265,12 @@
         $this->_credential = $credential;
         return $this;
     }
-    
+
     /**
      * setAmbiguityIdentity() - sets a flag for usage of identical identities
      * with unique credentials. It accepts integers (0, 1) or boolean (true,
      * false) parameters. Default is false.
-     * 
+     *
      * @param  int|bool $flag
      * @return Zend_Auth_Adapter_DbTable
      */
@@ -284,9 +284,9 @@
         return $this;
     }
     /**
-     * getAmbiguityIdentity() - returns TRUE for usage of multiple identical 
+     * getAmbiguityIdentity() - returns TRUE for usage of multiple identical
      * identies with different credentials, FALSE if not used.
-     * 
+     *
      * @return bool
      */
     public function getAmbiguityIdentity()
@@ -367,7 +367,7 @@
         $this->_authenticateSetup();
         $dbSelect = $this->_authenticateCreateSelect();
         $resultIdentities = $this->_authenticateQuerySelect($dbSelect);
-        
+
         if ( ($authResult = $this->_authenticateValidateResultSet($resultIdentities)) instanceof Zend_Auth_Result) {
             return $authResult;
         }
@@ -382,7 +382,7 @@
             }
             $resultIdentities = $validIdentities;
         }
-        
+
         $authResult = $this->_authenticateValidateResult(array_shift($resultIdentities));
         return $authResult;
     }
@@ -477,7 +477,7 @@
                 $origDbFetchMode = $this->_zendDb->getFetchMode();
                 $this->_zendDb->setFetchMode(Zend_DB::FETCH_ASSOC);
             }
-            $resultIdentities = $this->_zendDb->fetchAll($dbSelect->__toString());
+            $resultIdentities = $this->_zendDb->fetchAll($dbSelect);
             if (isset($origDbFetchMode)) {
                 $this->_zendDb->setFetchMode($origDbFetchMode);
                 unset($origDbFetchMode);