php deprecated 사용되는 코드 수정

gnuboard · Mar 3, 2020 · 230e3cb · 230e3cb
1 parent f529f69
commit 230e3cb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/install/install_db.php b/install/install_db.php
@@ -319,8 +319,7 @@
         // 게시판 테이블 생성
         $file = file("../".G5_ADMIN_DIR."/sql_write.sql");
         $file = get_db_create_replace($file);
-
-        $sql = implode($file, "\n");
+        $sql = implode('\n', $file);
 
         $create_table = $table_prefix.'write_' . $tmp_bo_table[$i];
 

diff --git a/lib/pbkdf2.compat.php b/lib/pbkdf2.compat.php
@@ -46,7 +46,7 @@ function create_hash($password, $force_compat = false)
 {
     // Generate the salt.
 
-    if (function_exists('mcrypt_create_iv')) {
+    if (function_exists('mcrypt_create_iv') && version_compare( PHP_VERSION, '7.2' , '<' ) ) {
         $salt = base64_encode(mcrypt_create_iv(PBKDF2_COMPAT_SALT_BYTES, MCRYPT_DEV_URANDOM));
     } elseif (@file_exists('/dev/urandom') && $fp = @fopen('/dev/urandom', 'r')) {
         $salt = base64_encode(fread($fp, PBKDF2_COMPAT_SALT_BYTES));