tag 1.4.2.1

git-svn-id: http://xe-core.googlecode.com/svn/trunk@7480 201d5d3c-b55e-5fd7-737f-ddc643e51545

classes/context/Context.class.php

@@ -94,10 +94,13 @@
 
             // Load Language File 
             $lang_supported = $this->loadLangSelected();
-
             // Retrieve language type set in user's cookie 
 			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'];
 

classes/template/TemplateHandler.class.php

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

common/css/button.css

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

common/js/xml_handler.js

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

common/script.php

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

config/config.inc.php

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