Author: jwage
Date: 2008-09-13 11:28:20 +0100 (Sat, 13 Sep 2008)
New Revision: 4961

Modified:
   branches/1.0/lib/Doctrine/Query/Abstract.php
Log:
Fixing use_dql_callbacks so it can be specified at the connection level as well 
as the manager level.


Modified: branches/1.0/lib/Doctrine/Query/Abstract.php
===================================================================
--- branches/1.0/lib/Doctrine/Query/Abstract.php        2008-09-13 06:34:47 UTC 
(rev 4960)
+++ branches/1.0/lib/Doctrine/Query/Abstract.php        2008-09-13 10:28:20 UTC 
(rev 4961)
@@ -1039,7 +1039,7 @@
      */
     protected function _preQuery()
     {
-        if ( ! $this->_preQueried && 
Doctrine_Manager::getInstance()->getAttribute('use_dql_callbacks')) {
+        if ( ! $this->_preQueried && 
$this->getConnection()->getAttribute('use_dql_callbacks')) {
             $this->_preQueried = true;
 
             $callback = $this->_getDqlCallback();


--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups 
"doctrine-svn" group.
 To post to this group, send email to [email protected]
 To unsubscribe from this group, send email to [EMAIL PROTECTED]
 For more options, visit this group at 
http://groups.google.co.uk/group/doctrine-svn?hl=en-GB
-~----------~----~----~----~------~----~------~--~---

Reply via email to