From b22a6268f2fb486f6f736f3ac22b52f46ace54c5 Mon Sep 17 00:00:00 2001 From: james Date: Thu, 30 Jun 2011 13:08:45 -0400 Subject: [PATCH] CC-2471:error when upload a duplicate file - fixed - Please read the comment on the ticket --- airtime_mvc/application/configs/constants.php | 3 +++ airtime_mvc/application/models/StoredFile.php | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/airtime_mvc/application/configs/constants.php b/airtime_mvc/application/configs/constants.php index ceedf7f3f..0f5e4a07c 100644 --- a/airtime_mvc/application/configs/constants.php +++ b/airtime_mvc/application/configs/constants.php @@ -4,6 +4,9 @@ define('AIRTIME_VERSION', '1.9.0-beta2'); define('AIRTIME_COPYRIGHT_DATE', '2010-2011'); define('AIRTIME_REST_VERSION', '1.1'); +// this constant is still used in somewhere +define('UI_MDATA_KEY_TITLE', 'track_title'); + // Metadata Keys for files define('MDATA_KEY_FILEPATH', 'filepath'); define('MDATA_KEY_MD5', 'md5'); diff --git a/airtime_mvc/application/models/StoredFile.php b/airtime_mvc/application/models/StoredFile.php index 67f658a51..807a3f584 100644 --- a/airtime_mvc/application/models/StoredFile.php +++ b/airtime_mvc/application/models/StoredFile.php @@ -805,7 +805,7 @@ class StoredFile { die('{"jsonrpc" : "2.0", "error" : {"code": 101, "message": ' . $duplicate->getMessage() .'}}'); } if (file_exists($duplicate->getFilePath())) { - $duplicateName = $duplicate->getMetadataValue(UI_MDATA_KEY_TITLE); + $duplicateName = $duplicate->getMetadataValue("UI_MDATA_KEY_TITLE"); die('{"jsonrpc" : "2.0", "error" : {"code": 101, "message": "An identical audioclip named ' . $duplicateName . ' already exists in the storage server."}}'); } }