1 files changed, 14 insertions, 5 deletions
diff --git a/includes/job/jobs/AssembleUploadChunksJob.php b/includes/job/jobs/AssembleUploadChunksJob.php
index c5dd9eaa..6237e568 100644
--- a/includes/job/jobs/AssembleUploadChunksJob.php
+++ b/includes/job/jobs/AssembleUploadChunksJob.php
@@ -42,6 +42,15 @@ class AssembleUploadChunksJob extends Job {
 				return false;
 			}
 
+			if ( count( $_SESSION ) === 0 ) {
+				// Empty session probably indicates that we didn't associate
+				// with the session correctly. Note that being able to load
+				// the user does not necessarily mean the session was loaded.
+				// Most likely cause by suhosin.session.encrypt = On.
+				$this->setLastError( "Error associating with user session. Try setting suhosin.session.encrypt = Off" );
+				return false;
+			}
+
 			UploadBase::setSessionStatus(
 				$this->params['filekey'],
 				array( 'result' => 'Poll', 'stage' => 'assembling', 'status' => Status::newGood() )
@@ -82,11 +91,11 @@ class AssembleUploadChunksJob extends Job {
 			UploadBase::setSessionStatus(
 				$this->params['filekey'],
 				array(
-					'result'    => 'Success',
-					'stage'     => 'assembling',
-					'filekey'   => $newFileKey,
+					'result' => 'Success',
+					'stage' => 'assembling',
+					'filekey' => $newFileKey,
 					'imageinfo' => $imageInfo,
-					'status'    => Status::newGood()
+					'status' => Status::newGood()
 				)
 			);
 		} catch ( MWException $e ) {
@@ -94,7 +103,7 @@ class AssembleUploadChunksJob extends Job {
 				$this->params['filekey'],
 				array(
 					'result' => 'Failure',
-					'stage'  => 'assembling',
+					'stage' => 'assembling',
 					'status' => Status::newFatal( 'api-error-stashfailed' )
 				)
 			);