From e0edc507947a931f9c9e5c906a946bb008716ddb Mon Sep 17 00:00:00 2001
From: Mzhelskiy Maxim <rus.engine@gmail.com>
Date: Sat, 13 Feb 2010 13:09:48 +0000
Subject: [PATCH] fix load modules

---
 engine/classes/Engine.class.php | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/engine/classes/Engine.class.php b/engine/classes/Engine.class.php
index 3a5e8d70..852a9994 100644
--- a/engine/classes/Engine.class.php
+++ b/engine/classes/Engine.class.php
@@ -211,7 +211,9 @@ class Engine extends Object {
 	protected function LoadModules() {
 		$this->LoadConfig();
 		foreach ($this->aConfigModule['autoLoad'] as $sModuleName) {
-			$this->LoadModule($sModuleName);
+			if (!isset($this->aModules[$sModuleName])) {
+				$this->LoadModule($sModuleName);
+			}
 		}
 	}
 	/**
@@ -283,11 +285,11 @@ class Engine extends Object {
 
 			foreach ($aPluginList as $sPluginName) {
 				$sDirPlugins=Config::Get('path.root.server').'/plugins/';
-				$sFile="{$sDirPlugins}{$sPluginName}/Plugin{$sPluginName}.class.php";
+				$sPluginNameClass='Plugin'.ucfirst($sPluginName);
+				$sFile="{$sDirPlugins}{$sPluginName}/{$sPluginNameClass}.class.php";
 				if(is_file($sFile)) {
-					require_once($sFile);
-					
-					$sClassName="Plugin{$sPluginName}";
+					require_once($sFile);					
+					$sClassName="{$sPluginNameClass}";
 					$oPlugin=new $sClassName;
 					$oPlugin->Delegate();
 					$oPlugin->Init();