Remove API v1 compatability code

Signed-off-by: Florian Pritz <bluewind@xinu.at>

2 files changed, 1 insertions, 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();