From 6bcacec946ad68e228e8e96478ddb2e129fe30e1 Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Sat, 19 Oct 2013 02:23:52 +0400
Subject: [PATCH] Revert "Better handling of trying to configure already
 instantiated component"

This reverts commit 6b15768a3f8613edaf611b13b4f55e3b60773ab6.
---
 framework/yii/base/Module.php | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/framework/yii/base/Module.php b/framework/yii/base/Module.php
index abf39ec..ee3949b 100644
--- a/framework/yii/base/Module.php
+++ b/framework/yii/base/Module.php
@@ -546,15 +546,10 @@ abstract class Module extends Component
 	public function setComponents($components)
 	{
 		foreach ($components as $id => $component) {
-			if (isset($this->_components[$id]) && !($this->_components[$id] instanceof Object)) {
-				if (isset($this->_components[$id]['class']) && !isset($component['class'])) {
-					$component['class'] = $this->_components[$id]['class'];
-				}
-				$this->_components[$id] = $component;
-			}
-			else {
-				throw new Exception('Cannot set component "'.$id.'" that is already instantiated.');
+			if (isset($this->_components[$id]['class']) && !isset($component['class'])) {
+				$component['class'] = $this->_components[$id]['class'];
 			}
+			$this->_components[$id] = $component;
 		}
 	}