update trunk and tag 1.4.2.0

git-svn-id: http://xe-core.googlecode.com/svn/trunk@7470 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
haneul 2010-05-18 08:39:37 +00:00
parent 55e72e3b47
commit fae67f375d
70 changed files with 7400 additions and 507 deletions

View file

@ -13,7 +13,7 @@
* @brief XE의 전체 버전 표기
* 파일의 수정이 없더라도 공식 릴리즈시에 수정되어 함께 배포되어야
**/
define('__ZBXE_VERSION__', '1.4.1.1');
define('__ZBXE_VERSION__', '1.4.2.0');
/**
* @brief zbXE가 설치된 장소의 base path를 구함
@ -107,11 +107,6 @@
require _XE_PATH_.'libs/FirePHPCore/FirePHP.class.php';
}
/**
* @brief 간단하게 사용하기 위한 함수 정의한 파일 require
**/
require(_XE_PATH_.'config/func.inc.php');
/**
* @brief Set Timezone as server time
**/
@ -120,29 +115,36 @@
date_default_timezone_set(@date_default_timezone_get());
}
if(!defined('__XE_LOADED_CLASS__')){
/**
* @brief 간단하게 사용하기 위한 함수 정의한 파일 require
**/
require(_XE_PATH_.'config/func.inc.php');
if(__DEBUG__) define('__StartTime__', getMicroTime());
if(__DEBUG__) define('__StartTime__', getMicroTime());
/**
* @brief 기본적인 class 파일 include
* @TODO : PHP5 기반으로 바꾸게 되면 _autoload() 이용할 있기에 제거 대상
**/
if(__DEBUG__) define('__ClassLoadStartTime__', getMicroTime());
require(_XE_PATH_.'classes/object/Object.class.php');
require(_XE_PATH_.'classes/extravar/Extravar.class.php');
require(_XE_PATH_.'classes/handler/Handler.class.php');
require(_XE_PATH_.'classes/xml/XmlParser.class.php');
require(_XE_PATH_.'classes/xml/XmlJsFilter.class.php');
require(_XE_PATH_.'classes/context/Context.class.php');
require(_XE_PATH_.'classes/db/DB.class.php');
require(_XE_PATH_.'classes/file/FileHandler.class.php');
require(_XE_PATH_.'classes/widget/WidgetHandler.class.php');
require(_XE_PATH_.'classes/editor/EditorHandler.class.php');
require(_XE_PATH_.'classes/module/ModuleObject.class.php');
require(_XE_PATH_.'classes/module/ModuleHandler.class.php');
require(_XE_PATH_.'classes/display/DisplayHandler.class.php');
require(_XE_PATH_.'classes/template/TemplateHandler.class.php');
require(_XE_PATH_.'classes/mail/Mail.class.php');
require(_XE_PATH_.'classes/page/PageHandler.class.php');
if(__DEBUG__) $GLOBALS['__elapsed_class_load__'] = getMicroTime() - __ClassLoadStartTime__;
/**
* @brief 기본적인 class 파일 include
* @TODO : PHP5 기반으로 바꾸게 되면 _autoload() 이용할 있기에 제거 대상
**/
if(__DEBUG__) define('__ClassLoadStartTime__', getMicroTime());
require(_XE_PATH_.'classes/object/Object.class.php');
require(_XE_PATH_.'classes/extravar/Extravar.class.php');
require(_XE_PATH_.'classes/handler/Handler.class.php');
require(_XE_PATH_.'classes/xml/XmlParser.class.php');
require(_XE_PATH_.'classes/xml/XmlJsFilter.class.php');
require(_XE_PATH_.'classes/cache/CacheHandler.class.php');
require(_XE_PATH_.'classes/context/Context.class.php');
require(_XE_PATH_.'classes/db/DB.class.php');
require(_XE_PATH_.'classes/file/FileHandler.class.php');
require(_XE_PATH_.'classes/widget/WidgetHandler.class.php');
require(_XE_PATH_.'classes/editor/EditorHandler.class.php');
require(_XE_PATH_.'classes/module/ModuleObject.class.php');
require(_XE_PATH_.'classes/module/ModuleHandler.class.php');
require(_XE_PATH_.'classes/display/DisplayHandler.class.php');
require(_XE_PATH_.'classes/template/TemplateHandler.class.php');
require(_XE_PATH_.'classes/mail/Mail.class.php');
require(_XE_PATH_.'classes/page/PageHandler.class.php');
if(__DEBUG__) $GLOBALS['__elapsed_class_load__'] = getMicroTime() - __ClassLoadStartTime__;
}
?>

View file

@ -895,4 +895,17 @@
return;
}
function requirePear()
{
if(version_compare(PHP_VERSION, "5.3.0") < 0)
{
set_include_path(_XE_PATH_."libs/PEAR");
}
else
{
set_include_path(_XE_PATH_."libs/PEAR.1.9");
}
}
?>