Fix potential fatal error when migrating from previous session

This commit is contained in:
Kijin Sung 2017-02-11 14:21:21 +09:00
parent b32ae03396
commit 0a5042ec6e
2 changed files with 8 additions and 3 deletions

View file

@ -187,12 +187,12 @@ function getNextSequence()
*/ */
function setUserSequence($seq) function setUserSequence($seq)
{ {
if(!isset($_SESSION['seq'])) if (!isset($_SESSION['seq']) || !is_array($_SESSION['seq']))
{ {
$_SESSION['seq'] = array(); $_SESSION['seq'] = array();
} }
debugPrint($_SESSION['seq']); $seq = intval($seq);
$_SESSION['seq'][] = $seq; $_SESSION['seq'][$seq] = $seq;
} }
/** /**
@ -203,6 +203,7 @@ function setUserSequence($seq)
*/ */
function checkUserSequence($seq) function checkUserSequence($seq)
{ {
$seq = intval($seq);
return isset($_SESSION['seq']) && in_array($seq, $_SESSION['seq']); return isset($_SESSION['seq']) && in_array($seq, $_SESSION['seq']);
} }

View file

@ -699,6 +699,10 @@ class fileController extends file
*/ */
function setUploadInfo($editor_sequence, $upload_target_srl=0) 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])) if(!isset($_SESSION['upload_info'][$editor_sequence]))
{ {
$_SESSION['upload_info'][$editor_sequence] = new stdClass(); $_SESSION['upload_info'][$editor_sequence] = new stdClass();