Make sure Firefogg gets the json it needs.

diff --git a/includes/api/ApiUpload.php b/includes/api/ApiUpload.php
index e99e5d9..b426262 100644 (file)
--- a/includes/api/ApiUpload.php
+++ b/includes/api/ApiUpload.php
@@ -249,7 +249,7 @@ class ApiUpload extends ApiBase {
                        $this->getResult()->setIndexedTagName( $result['details'], 'error' );
 
                        $this->dieUsage( 'An internal error occurred', 'internal-error', 0, $error );
-               } elseif( isset($status->value->uploadUrl) ) {
+               } elseif( $this->mParams['enablechunks'] ) {
                        return $status->value;
                }
 

diff --git a/includes/upload/UploadFromChunks.php b/includes/upload/UploadFromChunks.php
index 8432d12..2feccb4 100644 (file)
--- a/includes/upload/UploadFromChunks.php
+++ b/includes/upload/UploadFromChunks.php
@@ -164,7 +164,7 @@ class UploadFromChunks extends UploadBase {
                        // firefogg expects a specific result
                        // http://www.firefogg.org/dev/chunk_post.html
                        return Status::newGood(
-                               array('result' => 1, 'done' => 1, 'resultUrl' => $file->getDescriptionUrl() )
+                               array('result' => 1, 'done' => 1, 'resultUrl' => wfExpandUrl( $file->getDescriptionUrl() ) )
                        );
                }