[Quickfw-git] SF.net Git: quickfw branch, master, updated. 6c578872e8c8f59a141c01b87c78e214e96f7045

[Ivan1986 <iva...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "quickfw".

The branch, master has been updated
       via  6c578872e8c8f59a141c01b87c78e214e96f7045 (commit)
      from  2abeb977bdbd63c9e7f7b88598ef640732110795 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 6c578872e8c8f59a141c01b87c78e214e96f7045
Author: Ivan1986 <iva...@li...>
Date:   Tue May 25 15:27:55 2010 +0400

    Убрана условная инициализация БД

diff --git a/QFW/Init.php b/QFW/Init.php
index c213fbd..5ecfde7 100644
--- a/QFW/Init.php
+++ b/QFW/Init.php
@@ -63,6 +63,10 @@ class QFW
 		if (!empty(self::$config['host']['encoding']))
 			header("Content-Type: text/html; charset=".self::$config['host']['encoding']);
 
+		//Инициализируем класс базы данных
+		require LIBPATH.'/DbSimple/Connect.php';
+		self::$db = new DbSimple_Connect(self::$config['database']);
+
 		//Подключаем шаблонизатор
 		$templ = ucfirst(self::$config['templater']['name']);
 		$class = 'Templater_'.$templ;
@@ -87,13 +91,6 @@ class QFW
 	 */
 	static public function modules()
 	{
-		//Инициализируем класс базы данных
-		if (!empty(self::$config['database']))
-		{
-			require LIBPATH.'/DbSimple/Connect.php';
-			self::$db = new DbSimple_Connect(self::$config['database']);
-		}
-
 		//Включаем обработку фатальных ошибок, если в конфиге указано
 		if (!empty(self::$config['QFW']['catchFE']))
 			require QFWPATH.'/QuickFW/Error.php';

-----------------------------------------------------------------------

Summary of changes:
 QFW/Init.php |   11 ++++-------
 1 files changed, 4 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
quickfw