Page MenuHomeIn-Portal Phabricator

D372.diff
No OneTemporary

File Metadata

Created
Fri, Jun 13, 6:13 PM

D372.diff

Index: core/admin_templates/js/uploader/uploader.js
===================================================================
--- core/admin_templates/js/uploader/uploader.js
+++ core/admin_templates/js/uploader/uploader.js
@@ -616,8 +616,9 @@
return ;
}
- // new uploaded file name returned by OnUploadFile event
+ // new uploaded file name/size returned by OnUploadFile event
file.name = $json_response.result;
+ file.size = $json_response.size;
this.onUploadFileComplete(file);
};
Index: core/kernel/db/db_event_handler.php
===================================================================
--- core/kernel/db/db_event_handler.php
+++ core/kernel/db/db_event_handler.php
@@ -3151,12 +3151,13 @@
$upload_helper = $this->Application->recallObject('kUploadHelper');
try {
- $filename = $upload_helper->handle($event);
+ list($filename, $size) = $upload_helper->handle($event);
$response = array(
'jsonrpc' => '2.0',
'status' => 'success',
'result' => $filename,
+ 'size' => $size,
);
}
catch ( kUploaderException $e ) {
Index: core/units/helpers/upload_helper.php
===================================================================
--- core/units/helpers/upload_helper.php
+++ core/units/helpers/upload_helper.php
@@ -40,7 +40,7 @@
*
* @param kEvent $event Event.
*
- * @return string
+ * @return array
* @throws kUploaderException When upload could not be handled properly.
*/
public function handle(kEvent $event)
@@ -105,7 +105,11 @@
$this->deleteTempFiles($thumbs_path);
}
- return preg_replace('/^' . preg_quote($id, '/') . '_/', '', $filename);
+ // Add display name/size of uploaded file.
+ return array(
+ preg_replace('/^' . preg_quote($id, '/') . '_/', '', $filename),
+ filesize($file_path),
+ );
}
/**

Event Timeline