Merge pull request #3 from redmatrix/master

Update branch

1 files changed, 13 insertions, 14 deletions

diff --git a/include/identity.php b/include/identity.php
index 0c4a9df45..95ade3b28 100644
--- a/include/identity.php
+++ b/include/identity.php
@@ -710,7 +710,8 @@ function identity_export_year($channel_id,$year,$month = 0) {
 	else
 		$maxdate = datetime_convert('UTC','UTC',$year+1 . '-01-01 00:00:00');
 
-	$r = q("select * from item where item_wall = 1 and item_deleted = 0 and uid = %d and created >= '%s' and created < '%s'  and resource_type = '' order by created",
+	$r = q("select * from item where ( item_wall = 1 or item_type != %d ) and item_deleted = 0 and uid = %d and created >= '%s' and created < '%s'  and resource_type = '' order by created",
+		intval(ITEM_TYPE_POST),
 		intval($channel_id),
 		dbesc($mindate), 
 		dbesc($maxdate)
@@ -904,19 +905,6 @@ function profile_load(&$a, $nickname, $profile = '') {
 }
 
 /**
- * @brief
- *
- * @param App &$a
- * @param boolean $connect
- */
-function profile_create_sidebar(&$a, $connect = true) {
-
-	$block = (((get_config('system', 'block_public')) && (! local_channel()) && (! remote_channel())) ? true : false);
-
-	$a->set_widget('profile', profile_sidebar($a->profile, $block, $connect));
-}
-
-/**
  * @brief Formats a profile for display in the sidebar.
  *
  * It is very difficult to templatise the HTML completely
@@ -1702,3 +1690,14 @@ function get_channel_default_perms($uid) {
 
 	return 0;
 }
+
+
+function profiles_build_sync($channel_id) {
+	
+	$r = q("select * from profile where uid = %d",
+		intval($channel_id)
+	);
+	if($r) {
+		build_sync_packet($channel_id,array('profile' => $r));
+	}
+}