change charset encoding function

kirrie · Aug 17, 2016 · 7f7773f · 7f7773f
1 parent be6be95
commit 7f7773f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/HappySF/Article.php b/HappySF/Article.php
@@ -39,8 +39,12 @@ public function setURL($url) {
 
 	private function convertCharacterEncodingToUTF8($text) {
 		$text = !is_string($text) ? '' : $text;
-
-		return (empty($text) ? $text : iconv('EUC-KR', 'UTF-8//IGNORE', $text));
+
+		if(function_exists('mb_convert_encoding')) {
+			return mb_convert_encoding($text, 'UTF-8', 'EUC-KR');
+		} else {
+			return (empty($text) ? $text : iconv('EUC-KR', 'UTF-8//IGNORE', $text));
+		}
 	}
 
 	public function setTitle($title) {

diff --git a/index.php b/index.php
@@ -69,6 +69,12 @@ function getConfig() {
 		->setContentType('text/html; charset=utf-8')
 		->setStatusCode($e->getResponse()->getStatusCode())
 		->write($e->getMessage());
+} catch(Exception $e) {
+	$output
+		->unsetCacheHeader()
+		->setContentType('text/html; charset=utf-8')
+		->setStatusCode(500)
+		->write('Message: ' . $e->getMessage() . '<br />Stacks:<br />' . str_replace("\n", '<br />', $e->getTraceAsString()));
 }
 
 // flush