From 6ec45fdc8e71fbc365afbdb3262e580c831e1950 Mon Sep 17 00:00:00 2001 From: Alexey Kachayev Date: Wed, 27 Jan 2010 15:14:00 +0000 Subject: [PATCH] =?UTF-8?q?Fix=20=D0=B7=D0=B0=D0=B3=D1=80=D1=83=D0=B7?= =?UTF-8?q?=D0=BA=D0=B8=20=D1=84=D0=B0=D0=B9=D0=BB=D0=BE=D0=B2=20=D1=85?= =?UTF-8?q?=D1=83=D0=BA=D0=BE=D0=B2,=20=D0=BA=D0=BE=D0=BD=D1=84=D0=B8?= =?UTF-8?q?=D0=B3=D0=BE=D0=B2=20=D0=B8=20=D1=8F=D0=B7=D1=8B=D0=BA=D0=BE?= =?UTF-8?q?=D0=B2=D1=8B=D1=85=20=D1=84=D0=B0=D0=B9=D0=BB=D0=BE=D0=B2=20?= =?UTF-8?q?=D0=B8=D0=B7=20=D0=B4=D0=B8=D1=80=D0=B5=D0=BA=D1=82=D0=BE=D1=80?= =?UTF-8?q?=D0=B8=D0=B9=20=D0=B0=D0=BA=D1=82=D0=B8=D0=B2=D0=BD=D1=8B=D1=85?= =?UTF-8?q?=20=D0=BF=D0=BB=D0=B0=D0=B3=D0=B8=D0=BD=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/loader.php | 1 + engine/classes/Engine.class.php | 6 +++++- engine/modules/lang/Lang.class.php | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/config/loader.php b/config/loader.php index 1bd24acc..f25dec3c 100644 --- a/config/loader.php +++ b/config/loader.php @@ -133,6 +133,7 @@ if(file_exists(Config::Get('path.root.server').'/config/config.stable.php')) { $sPluginsDir = Config::Get('path.root.server').'/plugins'; $sPluginsListFile = $sPluginsDir.'/plugins.dat'; if($aPluginsList=@file($sPluginsListFile)) { + $aPluginsList=array_map('trim',$aPluginsList); foreach ($aPluginsList as $sPlugin) { $aConfigFiles = glob($sPluginsDir.'/'.$sPlugin.'/config/*.php'); if(count($aConfigFiles)>0) { diff --git a/engine/classes/Engine.class.php b/engine/classes/Engine.class.php index 5b912b00..9c0a3537 100644 --- a/engine/classes/Engine.class.php +++ b/engine/classes/Engine.class.php @@ -248,6 +248,8 @@ class Engine extends Object { */ protected function InitPluginHooks() { if($aPluginList = @file(Config::Get('path.root.server').'/plugins/plugins.dat')) { + $aPluginList=array_map('trim',$aPluginList); + $aFiles=array(); $sDirHooks=Config::Get('path.root.server').'/plugins/'; @@ -272,7 +274,9 @@ class Engine extends Object { * */ protected function InitPlugins() { - if($aPluginList = @file(Config::Get('path.root.server').'/plugins/plugins.dat')) { + if($aPluginList = @file(Config::Get('path.root.server').'/plugins/plugins.dat')) { + $aPluginList=array_map('trim',$aPluginList); + foreach ($aPluginList as $sPluginName) { $sDirPlugins=Config::Get('path.root.server').'/plugins/'; $sFile="{$sDirPlugins}{$sPluginName}/Plugin{$sPluginName}.class.php"; diff --git a/engine/modules/lang/Lang.class.php b/engine/modules/lang/Lang.class.php index 4bf65a6b..f842c403 100644 --- a/engine/modules/lang/Lang.class.php +++ b/engine/modules/lang/Lang.class.php @@ -114,6 +114,7 @@ class LsLang extends Module { * Ищет языковые файлы актвиированных плагинов */ if($aPluginList = @file(Config::Get('path.root.server').'/plugins/plugins.dat')) { + $aPluginList=array_map('trim',$aPluginList); $sDir=Config::Get('path.root.server').'/plugins/'; foreach ($aPluginList as $sPluginName) {