From e7e1f088c11890e520619c545f7f28d0f9d6724a Mon Sep 17 00:00:00 2001 From: Florian Pritz Date: Fri, 7 Oct 2016 12:53:02 +0200 Subject: Remove API v1 compatability code Signed-off-by: Florian Pritz --- application/controllers/api/v2/file.php | 4 ---- application/service/files.php | 3 +-- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/application/controllers/api/v2/file.php b/application/controllers/api/v2/file.php index 79da1c4b8..6eb0ae43b 100644 --- a/application/controllers/api/v2/file.php +++ b/application/controllers/api/v2/file.php @@ -61,10 +61,6 @@ class file extends \controllers\api\api_controller { $this->muser->require_access("apikey"); $history = \service\files::history($this->muser->get_userid()); 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']); } diff --git a/application/service/files.php b/application/service/files.php index 746cd1162..b45ac8e6f 100644 --- a/application/service/files.php +++ b/application/service/files.php @@ -53,9 +53,8 @@ class files { $multipaste_items_grouped = array(); $multipaste_items = array(); - # APIv1-cleanup: Remove multipaste_id and user_id $query = $CI->db - ->select('m.url_id, m.multipaste_id, m.user_id, m.date') + ->select('m.url_id, m.date') ->from("multipaste m") ->where("user_id", $user) ->get()->result_array(); -- cgit v1.2.3-24-g4f1b