Merge branch '54' of github.com:gnuboard/g5 into 54

bbs/write_comment_update.php

@@ -341,7 +341,7 @@ delete_cache_latest($bo_table);
 
 $redirect_url = short_url_clean(G5_HTTP_BBS_URL.'/board.php?bo_table='.$bo_table.'&wr_id='.$wr['wr_parent'].'&'.$qstr.'&#c_'.$comment_id);
 
-run_event('comment_update_after', $board, $wr_id, $w, $qstr, $redirect_url);
+run_event('comment_update_after', $board, $wr_id, $w, $qstr, $redirect_url, $comment_id);
 
 goto_url($redirect_url);
 ?>

config.php

@@ -5,7 +5,7 @@
 ********************/
 
 define('G5_VERSION', '그누보드5');
-define('G5_GNUBOARD_VER', '5.4.0.5');
+define('G5_GNUBOARD_VER', '5.4.0.6');
 
 // 이 상수가 정의되지 않으면 각각의 개별 페이지는 별도로 실행될 수 없음
 define('_GNUBOARD_', true);

extend/version.extend.php

@@ -1,6 +1,6 @@
 <?php
 if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
 
-define('G5_JS_VER',  '171222');
-define('G5_CSS_VER', '171222');
+define('G5_JS_VER',  '191110');
+define('G5_CSS_VER', '191110');
 ?>

lib/uri.lib.php

@@ -118,7 +118,7 @@ function short_url_clean($string_url, $add_qry=''){
         }
 
         $return_url = '';
-        $qstring = parse_str($url['query'], $vars);
+        parse_str($url['query'], $vars);
 
         // 예) Array ( [scheme] => http [host] => sir.kr [path] => /bbs/board.php [query] => wr_id=1110870&bo_table=cm_free&cpage=1 [fragment] => c_1110946 )
         //while(list($k,$v) = each($vars)) $page_name .= "/".$v;
@@ -134,7 +134,7 @@ function short_url_clean($string_url, $add_qry=''){
 
         foreach( $allow_param_keys as $key=>$v ){
             if( !isset($vars[$key]) || empty($vars[$key]) ) continue;
-            $add = '';
+
             $s[$key] = $vars[$key];
         }
 
@@ -143,7 +143,7 @@ function short_url_clean($string_url, $add_qry=''){
             
             if( $get_write['wr_seo_title'] ){
                 unset($s['wr_id']);
-                $s['wr_seo_title'] = $get_write['wr_seo_title'].'/';
+                $s['wr_seo_title'] = urlencode($get_write['wr_seo_title']).'/';
             }
         }
 
@@ -180,7 +180,12 @@ function short_url_clean($string_url, $add_qry=''){
 }
 
 function correct_goto_url($url){
-    return $url.'/';
+
+    if( substr($url, -1) !== '/' ){
+		return $url.'/';
+	}
+
+	return $url;
 }
 
 function generate_seo_title($string, $wordLimit=G5_SEO_TITEL_WORD_CUT){