diff --git a/adm/board_form_update.php b/adm/board_form_update.php
index b0bbf6889..bea127247 100644
--- a/adm/board_form_update.php
+++ b/adm/board_form_update.php
@@ -204,7 +204,7 @@ if ($w == '') {
$file = file('./sql_write.sql');
$file = get_db_create_replace($file);
- $sql = implode($file, "\n");
+ $sql = implode("\n", $file);
$create_table = $g5['write_prefix'] . $bo_table;
diff --git a/adm/faqlist.php b/adm/faqlist.php
index 80319c82f..6f4849bb0 100644
--- a/adm/faqlist.php
+++ b/adm/faqlist.php
@@ -68,15 +68,17 @@ $result = sql_query($sql);
$num = $i + 1;
$bg = 'bg'.($i%2);
+
+ $fa_subject = conv_content($row['fa_subject'], 1);
?>
|
- |
+ |
|
- 수정
- 삭제
+ 수정
+ 삭제
|
diff --git a/config.php b/config.php
index c137e648b..b5b39215b 100644
--- a/config.php
+++ b/config.php
@@ -5,8 +5,8 @@
********************/
define('G5_VERSION', '그누보드5');
-define('G5_GNUBOARD_VER', '5.4.2.1');
-define('G5_YOUNGCART_VER', '5.4.2.1');
+define('G5_GNUBOARD_VER', '5.4.2.2');
+define('G5_YOUNGCART_VER', '5.4.2.2');
// 이 상수가 정의되지 않으면 각각의 개별 페이지는 별도로 실행될 수 없음
define('_GNUBOARD_', true);
diff --git a/g4_import_run.php b/g4_import_run.php
index 6681df0e8..a0515bbaa 100644
--- a/g4_import_run.php
+++ b/g4_import_run.php
@@ -337,7 +337,7 @@ for($i=0; $row=sql_fetch_array($result); $i++) {
// 게시판 테이블 생성
$bo_table = $row['bo_table'];
$file = file(G5_ADMIN_PATH.'/sql_write.sql');
- $sql = implode($file, "\n");
+ $sql = implode("\n", $file);
$create_table = $g5['write_prefix'] . $bo_table;
diff --git a/install/install_db.php b/install/install_db.php
index a71d8fc45..73539409b 100644
--- a/install/install_db.php
+++ b/install/install_db.php
@@ -319,7 +319,7 @@ if($g5_install || !$result) {
// 게시판 테이블 생성
$file = file("../".G5_ADMIN_DIR."/sql_write.sql");
$file = get_db_create_replace($file);
- $sql = implode('\n', $file);
+ $sql = implode("\n", $file);
$create_table = $table_prefix.'write_' . $tmp_bo_table[$i];
diff --git a/lib/Cache/FileCache.class.php b/lib/Cache/FileCache.class.php
index f65948947..529312a5f 100644
--- a/lib/Cache/FileCache.class.php
+++ b/lib/Cache/FileCache.class.php
@@ -67,8 +67,14 @@ class FileCache
{
return FALSE;
}
-
- $data = unserialize(file_get_contents( $cache_file_path ));
+
+ try{
+ $file_contents = file_get_contents($cache_file_path);
+ $file_ex = explode("\n\n", $file_contents);
+ $data = unserialize(base64_decode($file_ex[1]));
+ } catch(Exception $e){
+ $data = array('ttl'=>1, 'time'=>time() - 1000);
+ }
if ($data['ttl'] > 0 && time() > $data['time'] + $data['ttl'])
{
@@ -135,7 +141,10 @@ class FileCache
'data' => $data
);
- if ($this->write_file($cache_file_path, serialize($contents)))
+ $cache_content = "\n\n";
+ $cache_content .= base64_encode(serialize($contents));
+
+ if ($this->write_file($cache_file_path, $cache_content))
{
chmod($cache_file_path, G5_FILE_PERMISSION);
return TRUE;
@@ -167,7 +176,7 @@ class FileCache
if ($ttl !== null) {
$expire = time() + $ttl;
}
- return serialize(array($data, $expire));
+ return base64_encode(serialize(array($data, $expire)));
}
/**
@@ -181,7 +190,7 @@ class FileCache
*/
public function decode($data)
{
- return unserialize($data);
+ return unserialize(base64_decode($data));
}
}
?>
\ No newline at end of file