aboutsummaryrefslogtreecommitdiffstats
path: root/include/identity.php
diff options
context:
space:
mode:
authorPaolo Tacconi <p.tacconi@giunti.it>2014-09-26 14:40:22 +0200
committerPaolo Tacconi <p.tacconi@giunti.it>2014-09-26 14:40:22 +0200
commiteaf96f987a5f22a54fdbb4cedef52b0159a37ad0 (patch)
treef1fce3898b757e3a29e928cc1afe724edb620471 /include/identity.php
parent6324a07dd8b17db5da0ce66c99fb69e2f3ec49e1 (diff)
parent574c4845b711c9ebf53efb2a0fe846f5aea46e87 (diff)
downloadvolse-hubzilla-eaf96f987a5f22a54fdbb4cedef52b0159a37ad0.tar.gz
volse-hubzilla-eaf96f987a5f22a54fdbb4cedef52b0159a37ad0.tar.bz2
volse-hubzilla-eaf96f987a5f22a54fdbb4cedef52b0159a37ad0.zip
Rebase from upstream
Diffstat (limited to 'include/identity.php')
-rw-r--r--include/identity.php7
1 files changed, 4 insertions, 3 deletions
diff --git a/include/identity.php b/include/identity.php
index 50c5d13b9..eaeb9f07f 100644
--- a/include/identity.php
+++ b/include/identity.php
@@ -431,14 +431,15 @@ function set_default_login_identity($account_id,$channel_id,$force = true) {
}
/**
- * @function identity_basic_export($channel_id)
+ * @function identity_basic_export($channel_id,$items = false)
* Create an array representing the important channel information
* which would be necessary to create a nomadic identity clone. This includes
* most channel resources and connection information with the exception of content.
*
* @param int $channel_id
* Channel_id to export
- *
+ * @param boolean $items
+ * Include channel posts (wall items), default false
*
* @returns array
* See function for details
@@ -521,7 +522,7 @@ function identity_basic_export($channel_id, $items = false) {
return $ret;
- $r = q("select * from item_id where uid = %d",
+ $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)
);