firstgarden/firstgarden-web-gnu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

충돌 수정

Browse Source
This commit is contained in:
thisgun
2019-11-05 10:12:31 +09:00
parent 6b4e8536b1 b60daff8f0
commit cf5cdcb0b1
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common.php
View File

@ -35,7 +35,7 @@ function g5_path()
$server_script_filename = preg_replace('/\/+/', '/', str_replace('\\', '/', $_SERVER['SCRIPT_FILENAME'])); $server_script_filename = preg_replace('/\/+/', '/', str_replace('\\', '/', $_SERVER['SCRIPT_FILENAME']));
$tilde_remove = preg_replace('/^\/\~[^\/]+(.*)$/', '$1', $server_script_name); $tilde_remove = preg_replace('/^\/\~[^\/]+(.*)$/', '$1', $server_script_name);
$document_root = str_replace($tilde_remove, '', $server_script_filename); $document_root = str_replace($tilde_remove, '', $server_script_filename);
$pattern = '/' . preg_quote($document_root, '/') . '/i'; $pattern = '/.*?' . preg_quote($document_root, '/') . '/i';
$root = preg_replace($pattern, '', $result['path']); $root = preg_replace($pattern, '', $result['path']);
$port = ($_SERVER['SERVER_PORT'] == 80 || $_SERVER['SERVER_PORT'] == 443) ? '' : ':'.$_SERVER['SERVER_PORT']; $port = ($_SERVER['SERVER_PORT'] == 80 || $_SERVER['SERVER_PORT'] == 443) ? '' : ':'.$_SERVER['SERVER_PORT'];
$http = 'http' . ((isset($_SERVER['HTTPS']) && $_SERVER['HTTPS']=='on') ? 's' : '') . '://'; $http = 'http' . ((isset($_SERVER['HTTPS']) && $_SERVER['HTTPS']=='on') ? 's' : '') . '://';

2
install/install_db.php
View File

@ -306,7 +306,7 @@ if($g5_install || !$result) {
sql_query($sql, true, $dblink); sql_query($sql, true, $dblink);
// 게시판 테이블 생성 // 게시판 테이블 생성
$file = file("../adm/sql_write.sql"); $file = file("../".G5_ADMIN_DIR."/sql_write.sql");
$sql = implode($file, "\n"); $sql = implode($file, "\n");
$create_table = $table_prefix.'write_' . $tmp_bo_table[$i]; $create_table = $table_prefix.'write_' . $tmp_bo_table[$i];