Development

Changeset 11661

You must first sign up to be able to contribute.

Changeset 11661

Show
Ignore:
Timestamp:
09/18/08 20:28:53 (5 years ago)
Author:
Jonathan.Wage
Message:

[1.2] Changing configureDoctrine() to be called after the database is initialized.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • plugins/sfDoctrinePlugin/trunk/config/autoload.yml

    r11654 r11661  
    55    path:           <?php echo realpath(dirname(__FILE__) . '/../lib') . "\n"; ?> 
    66    recursive:      on 
    7   doctrine_class: 
    8     name:           doctrine autoload 
    9     files: 
    10       Doctrine:       <?php echo realpath(dirname(__FILE__).'/../lib/addon/sfDoctrineAutoload.php')."\n"; ?> 

  • plugins/sfDoctrinePlugin/trunk/lib/database/sfDoctrineDatabase.class.php

    r11657 r11661  
    2222{ 
    2323  /** 
    24    * @var array Names of the initialized connections 
    25    */ 
    26   protected static $_initialized = array(); 
    27  
    28   /** 
    2924   * @var object Doctrine_Connection 
    3025   */ 
    …… 
    3934  public function initialize($parameters = array()) 
    4035  { 
    41     if (isset(self::$_initialized[$parameters['name']]) && self::$_initialized[$parameters['name']]) 
    42     { 
    43       return; 
    44     } 
    45  
    4636    parent::initialize($parameters); 
    4737 
    …… 
    6353    } 
    6454    $this->loadListeners(); 
    65     self::$_initialized[$name] = true; 
     55 
     56    $configuration = sfProjectConfiguration::getActive(); 
     57 
     58    if (method_exists($configuration, 'configureDoctrine')) 
     59    { 
     60      $configuration->configureDoctrine(); 
     61    } 
    6662  } 
    6763