[Solar-talk] solar_auth_adapter_sql

[Paul M Jones]

On Oct 17, 2007, at 2:18 PM, Jeff Surgeson wrote:

> Hi Paul
>
> I am sure you are aware of this already but if not, also I am not  
> sure if this
> is intentional or not.
>
> Solar_Auth_Adapter_Sql now has some funnies
>
> // get the results
> <<<<<<< .mine
> //$rows = $select->fetch('rowset');
> $rows = $select->fetch('all');
> =======
> $rows = $select->fetchAll();
>>>>>>>> .r2885
>
> There are also multiple versions of Solar_Auth_Adapte_Sql namely
>
> Sql.php
> Sql.php.mine
> Sql.php.r2879
> Sql.php.r2885

Hm, I am not seeing that here.  Is it possible that you made some  
local changes, and then svn update noted them as conflicts?





--

Paul M. Jones  <http://paul-m-jones.com>

Solar: Simple Object Library and Application Repository
for PHP5.  <http://solarphp.com>

Join the Solar community wiki!  <http://solarphp.org>

Savant: The simple, elegant, and powerful solution for
templates in PHP.  <http://phpsavant.com>