fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-10 12:32:14 +09:00
Code Issues Projects Releases Packages Wiki Activity

tag 1.4.2.1

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/trunk@7480 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
haneul 2010-05-19 10:09:04 +00:00
parent fae67f375d
commit d448678c63
6 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

7
classes/context/Context.class.php
View file

@ -94,10 +94,13 @@
// Load Language File // Load Language File
$lang_supported = $this->loadLangSelected(); $lang_supported = $this->loadLangSelected();
// Retrieve language type set in user's cookie // Retrieve language type set in user's cookie
if($this->get('l')) { if($this->get('l')) {
$_COOKIE['lang_type'] = $this->lang_type = $this->get('l'); $this->lang_type = $this->get('l');
if($_COOKIE['lang_type'] != $this->lang_type)
{
setcookie('lang_type', $this->lang_type);
}
} }
else if($_COOKIE['lang_type']) $this->lang_type = $_COOKIE['lang_type']; else if($_COOKIE['lang_type']) $this->lang_type = $_COOKIE['lang_type'];

2
classes/template/TemplateHandler.class.php
View file

@ -526,7 +526,7 @@
$eval_str = "?>".$buff; $eval_str = "?>".$buff;
eval($eval_str); eval($eval_str);
} else { } else {
@include($compiled_tpl_file); include($compiled_tpl_file);
} }
return ob_get_clean(); return ob_get_clean();

1
common/css/button.css
View file

@ -1,4 +1,3 @@
@charset "utf-8";
/* NHN > UIT Center > Open UI Platform Team > Jeong Chan Myeong(dece24@nhncorp.com) */ /* NHN > UIT Center > Open UI Platform Team > Jeong Chan Myeong(dece24@nhncorp.com) */
/* Anchor Button */ /* Anchor Button */

1
common/js/xml_handler.js
View file

@ -293,6 +293,7 @@ $.exec_xml = window.exec_xml = function(module, act, params, callback_func, resp
var msg = ''; var msg = '';
if (textStatus == 'parsererror') { if (textStatus == 'parsererror') {
msg = 'The result is not valid XML :\n-------------------------------------\n'; msg = 'The result is not valid XML :\n-------------------------------------\n';
if(xhr.responseText == "") return;
msg += xhr.responseText.replace(/<[^>]+>/g, ''); msg += xhr.responseText.replace(/<[^>]+>/g, '');
} else { } else {
msg = textStatus; msg = textStatus;

7
common/script.php
View file

@ -221,9 +221,10 @@ function convertEncodingStr($str) {
for($i=0;$i<count($charset_list);$i++) { for($i=0;$i<count($charset_list);$i++) {
$charset = $charset_list[$i]; $charset = $charset_list[$i];
if($str){ if($str){
$cstr = iconv($charset,$charset,$str); $cstr = iconv($charset,$charset.'//IGNORE',$str);
if($str == $cstr); if($str == $cstr && $charset != 'UTF-8'){
return $cstr; return iconv($charset, 'UTF-8//IGNORE', $str);
}
} }
} }

2
config/config.inc.php
View file

@ -13,7 +13,7 @@
* @brief XE의 전체 버전 표기 * @brief XE의 전체 버전 표기
* 이 파일의 수정이 없더라도 공식 릴리즈시에 수정되어 함께 배포되어야 함 * 이 파일의 수정이 없더라도 공식 릴리즈시에 수정되어 함께 배포되어야 함
**/ **/
define('__ZBXE_VERSION__', '1.4.2.0'); define('__ZBXE_VERSION__', '1.4.2.1');
/** /**
* @brief zbXE가 설치된 장소의 base path를 구함 * @brief zbXE가 설치된 장소의 base path를 구함