aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-08-17 21:41:14 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-08-17 21:41:14 -0700
commitea331b043c306d4250365a876c9e9ee857d4bdeb (patch)
tree163f1a53df947b80747b1788f10080de02122096
parent1a4a921528f1405c131762954d16f0f6c6b690b6 (diff)
parent1982fc807f9f7eb02429acb3a46bfd8e5ba32748 (diff)
downloadvolse-hubzilla-ea331b043c306d4250365a876c9e9ee857d4bdeb.tar.gz
volse-hubzilla-ea331b043c306d4250365a876c9e9ee857d4bdeb.tar.bz2
volse-hubzilla-ea331b043c306d4250365a876c9e9ee857d4bdeb.zip
Merge https://github.com/redmatrix/redmatrix into pending_merge
-rw-r--r--include/identity.php12
1 files changed, 12 insertions, 0 deletions
diff --git a/include/identity.php b/include/identity.php
index 804f316d1..bce578d87 100644
--- a/include/identity.php
+++ b/include/identity.php
@@ -626,6 +626,18 @@ function identity_export_year($channel_id,$year) {
$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;
}