From 40e8acdbf9f6249aaaf8305719784301485a9956 Mon Sep 17 00:00:00 2001
From: sakamocchi <o-takashi@sakamocchi.jp>
Date: Thu, 29 Mar 2012 14:34:11 +0900
Subject: [PATCH] =?utf8?q?CHANGE:=20globalfunctioos.php=E3=81=AB=E3=81=8A?=
 =?utf8?q?=E3=81=84=E3=81=A6=E3=80=81Entity=E3=82=AF=E3=83=A9=E3=82=B9?=
 =?utf8?q?=E3=81=AE=E3=82=A4=E3=83=B3=E3=82=AF=E3=83=AB=E3=83=BC=E3=83=89?=
 =?utf8?q?=E4=BD=8D=E7=BD=AE=E3=82=92=E5=A4=89=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

sql_connect()がデータベースとの接続を失敗した際に呼ばれるstartUpError()が、Entityクラスを利用するため。
---
 nucleus/libs/globalfunctions.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/nucleus/libs/globalfunctions.php b/nucleus/libs/globalfunctions.php
index c526124..3ebb7d7 100644
--- a/nucleus/libs/globalfunctions.php
+++ b/nucleus/libs/globalfunctions.php
@@ -156,6 +156,12 @@ if ( !headers_sent() )
 	header('Generator: Nucleus CMS ' . $nucleus['version']);
 }
 
+/*
+ * NOTE: Since 4.0 release, Entity class becomes to be important class
+ *  with some wrapper functions for htmlspechalchars/htmlentity PHP's built-in function
+*/
+include($DIR_LIBS . 'ENTITY.php');
+
 /* include core classes that are needed for login & plugin handling */
 include_once($DIR_LIBS . 'mysql.php');
 /* added for 3.5 sql_* wrapper */
@@ -339,7 +345,6 @@ include($DIR_LIBS . 'NOTIFICATION.php');
 include($DIR_LIBS . 'BAN.php');
 include($DIR_LIBS . 'PAGEFACTORY.php');
 include($DIR_LIBS . 'SEARCH.php');
-include($DIR_LIBS . 'ENTITY.php');
 include($DIR_LIBS . 'LINK.php');
 
 /* set lastVisit cookie (if allowed) */
-- 
2.11.0