deprecate the item_id table - replace with iconfig. A possibly useful function in the iconfig class would be a search which takes a service id and type and uid, matches against an item and returns the iid. That could save a bit of code duplication.

1 files changed, 1 insertions, 20 deletions

diff --git a/include/channel.php b/include/channel.php
index 087bd4162..92c274105 100644
--- a/include/channel.php
+++ b/include/channel.php
@@ -16,7 +16,7 @@ require_once('include/menu.php');
  * @param int $account_id
  *     Account_id used for this request
  *
- * @returns assoziative array with:
+ * @returns associative array with:
  *  * \e boolean \b success boolean true if creating a new channel is allowed for this account
  *  * \e string \b message (optional) if success is false, optional error text
  *  * \e int \b total_identities
@@ -676,14 +676,6 @@ function identity_basic_export($channel_id, $items = false) {
 		$ret['mail'] = $m;
 	}
 
-	$r = q("select item_id.*, item.mid from item_id left join item on item_id.iid = item.id where item_id.uid = %d",
-		intval($channel_id)
-	);
-
-	if($r)
-		$ret['item_id'] = $r;
-
-	//$key = get_config('system','prvkey');
 
 	/** @warning this may run into memory limits on smaller systems */
 
@@ -746,17 +738,6 @@ function identity_export_year($channel_id,$year,$month = 0) {
 			$ret['item'][] = encode_item($rr,true);
 	}
 
-	$r = q("select item_id.*, item.mid from item_id left join item on item_id.iid = item.id where item_id.uid = %d 
-		and item.created >= '%s' and item.created < '%s' order by created ",
-		intval($channel_id),
-		dbesc($mindate), 
-		dbesc($maxdate)
-	);
-
-	if($r)
-		$ret['item_id'] = $r;
-
-
 	return $ret;
 }