2
0
Quellcode durchsuchen

ZF-11349
Backed out r24026 from trunk: incomplete fix


git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@24075 44c647ce-9c0f-0410-b52a-842ac1e357ba

adamlundrigan vor 14 Jahren
Ursprung
Commit
d3d13cac8b
1 geänderte Dateien mit 2 neuen und 4 gelöschten Zeilen
  1. 2 4
      library/Zend/Tool/Project/Provider/DbAdapter.php

+ 2 - 4
library/Zend/Tool/Project/Provider/DbAdapter.php

@@ -47,7 +47,7 @@ class Zend_Tool_Project_Provider_DbAdapter
 
 
     protected $_sectionName = 'production';
     protected $_sectionName = 'production';
 
 
-    public function configure($dsn = null, /* $interactivelyPrompt = false, */ $sectionName = 'production', $forceOverwrite = false)
+    public function configure($dsn = null, /* $interactivelyPrompt = false, */ $sectionName = 'production')
     {
     {
         $profile = $this->_loadProfile(self::NO_PROFILE_THROW_EXCEPTION);
         $profile = $this->_loadProfile(self::NO_PROFILE_THROW_EXCEPTION);
 
 
@@ -69,9 +69,7 @@ class Zend_Tool_Project_Provider_DbAdapter
             throw new Zend_Tool_Project_Exception('The config does not have a ' . $this->_sectionName . ' section.');
             throw new Zend_Tool_Project_Exception('The config does not have a ' . $this->_sectionName . ' section.');
         }
         }
 
 
-        if (isset($this->_config->{$this->_sectionName}->resources->db) && $forceOverwrite === true) {
-            unset($this->_config->{$this->_sectionName}->resources->db);
-        } else {
+        if (isset($this->_config->{$this->_sectionName}->resources->db)) {
             throw new Zend_Tool_Project_Exception('The config already has a db resource configured in section ' . $this->_sectionName . '.');
             throw new Zend_Tool_Project_Exception('The config already has a db resource configured in section ' . $this->_sectionName . '.');
         }
         }