From 0a5042ec6e55c1a41e0ad1aec1087251a757e40a Mon Sep 17 00:00:00 2001 From: Kijin Sung Date: Sat, 11 Feb 2017 14:21:21 +0900 Subject: [PATCH] Fix potential fatal error when migrating from previous session --- common/legacy.php | 7 ++++--- modules/file/file.controller.php | 4 ++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/common/legacy.php b/common/legacy.php index 69fd3f716..b2c92e581 100644 --- a/common/legacy.php +++ b/common/legacy.php @@ -187,12 +187,12 @@ function getNextSequence() */ function setUserSequence($seq) { - if(!isset($_SESSION['seq'])) + if (!isset($_SESSION['seq']) || !is_array($_SESSION['seq'])) { $_SESSION['seq'] = array(); } - debugPrint($_SESSION['seq']); - $_SESSION['seq'][] = $seq; + $seq = intval($seq); + $_SESSION['seq'][$seq] = $seq; } /** @@ -203,6 +203,7 @@ function setUserSequence($seq) */ function checkUserSequence($seq) { + $seq = intval($seq); return isset($_SESSION['seq']) && in_array($seq, $_SESSION['seq']); } diff --git a/modules/file/file.controller.php b/modules/file/file.controller.php index 6f2ddf9c1..7ec1cf5bf 100644 --- a/modules/file/file.controller.php +++ b/modules/file/file.controller.php @@ -699,6 +699,10 @@ class fileController extends file */ function setUploadInfo($editor_sequence, $upload_target_srl=0) { + if(!isset($_SESSION['upload_info']) || !is_array($_SESSION['upload_info'])) + { + $_SESSION['upload_info'] = array(); + } if(!isset($_SESSION['upload_info'][$editor_sequence])) { $_SESSION['upload_info'][$editor_sequence] = new stdClass();