From 0fc43f914fc1037a9f6200e2bdabec71ba353938 Mon Sep 17 00:00:00 2001
From: Mzhelskiy Maxim <rus.engine@gmail.com>
Date: Wed, 2 Jun 2010 16:29:09 +0000
Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=B4=D0=B4=D0=B5=D1=80=D0=B6?=
 =?UTF-8?q?=D0=BA=D0=B0=20=D0=B7=D0=B0=D0=B3=D1=80=D1=83=D0=B7=D0=BA=D0=B8?=
 =?UTF-8?q?=20=D0=BA=D0=BE=D0=BD=D1=84=D0=B8=D0=B3=D0=B0=20=D1=88=D0=B0?=
 =?UTF-8?q?=D0=B1=D0=BB=D0=BE=D0=BD=D0=B0=20=D0=B8=D0=B7=20=D0=BA=D0=B0?=
 =?UTF-8?q?=D1=82=D0=B0=D0=BB=D0=BE=D0=B3=D0=B0=20settings/config/,=20?=
 =?UTF-8?q?=D0=BD=D0=B0=D0=BF=D1=80=D0=B8=D0=BC=D0=B5=D1=80,=20/templates/?=
 =?UTF-8?q?skin/new/settings/config/config.php?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/loader.php                      | 7 +++++++
 engine/modules/viewer/Viewer.class.php | 3 +--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/config/loader.php b/config/loader.php
index 4e43a577..6d6c9bc7 100644
--- a/config/loader.php
+++ b/config/loader.php
@@ -167,4 +167,11 @@ if($aPluginsList=@file($sPluginsListFile)) {
 		}
 	}
 }
+
+/**
+ * Загружает конфиг текущего шаблона
+ */
+if(file_exists(Config::Get('path.smarty.template').'/settings/config/config.php')) {
+	Config::LoadFromFile(Config::Get('path.smarty.template').'/settings/config/config.php',false);
+}
 ?>
\ No newline at end of file
diff --git a/engine/modules/viewer/Viewer.class.php b/engine/modules/viewer/Viewer.class.php
index 4d09374d..4d074e9a 100644
--- a/engine/modules/viewer/Viewer.class.php
+++ b/engine/modules/viewer/Viewer.class.php
@@ -654,8 +654,6 @@ class ModuleViewer extends Module {
 				}				
 			}
 		}
-
-		$this->aFileRules = Config::Get('head.rules');
 	}
 	/**
 	 * Создает css-компрессор и инициализирует его конфигурацию
@@ -718,6 +716,7 @@ class ModuleViewer extends Module {
 		 */
 		$aResult = $this->aFilesDefault;
 		
+		$this->aFileRules = Config::Get('head.rules');
 		foreach((array)$this->aFileRules as $sName => $aRule) {
 			if(!$aRule['path']) continue;