From 1ac83a99d3c7188f74ca4ecdec77a98ec9cef338 Mon Sep 17 00:00:00 2001 From: Florian Pritz Date: Mon, 4 Jul 2016 07:42:05 +0200 Subject: service\files->get_multipaste_history: Add sort order from DB Keep this field private for now. I may be exposed at a later time. The returned values are already normalized so they can be safely exposed. Signed-off-by: Florian Pritz --- application/controllers/api/v1/file.php | 5 +++++ application/controllers/api/v2/file.php | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) (limited to 'application/controllers') diff --git a/application/controllers/api/v1/file.php b/application/controllers/api/v1/file.php index dae053db2..784f42555 100644 --- a/application/controllers/api/v1/file.php +++ b/application/controllers/api/v1/file.php @@ -62,6 +62,11 @@ class file extends \controllers\api\api_controller { foreach ($history['items'] as $key => $item) { unset($history['items'][$key]['thumbnail']); } + foreach ($history['multipaste_items'] as $key => $multipaste_item) { + foreach ($multipaste_item['items'] as $inner_key => $item) { + unset($history['multipaste_items'][$key]['items'][$inner_key]['sort_order']); + } + } return $history; } diff --git a/application/controllers/api/v2/file.php b/application/controllers/api/v2/file.php index ba80ae309..ebe717f73 100644 --- a/application/controllers/api/v2/file.php +++ b/application/controllers/api/v2/file.php @@ -59,10 +59,14 @@ class file extends \controllers\api\api_controller { { $this->muser->require_access("apikey"); $history = \service\files::history($this->muser->get_userid()); - # APIv1-cleanup: Remove this foreach ($history['multipaste_items'] as $key => $item) { + # APIv1-cleanup: Remove this unset($history['multipaste_items'][$key]['user_id']); unset($history['multipaste_items'][$key]['multipaste_id']); + + foreach ($item['items'] as $inner_key => $item) { + unset($history['multipaste_items'][$key]['items'][$inner_key]['sort_order']); + } } return $history; } -- cgit v1.2.3-24-g4f1b