Merge branch 'master' of https://github.com/friendica/red

4 files changed, 11 insertions, 5 deletions

diff --git a/include/dir_fns.php b/include/dir_fns.php
index 1bc97cfec..14e4c0a1d 100644
--- a/include/dir_fns.php
+++ b/include/dir_fns.php
@@ -185,6 +185,7 @@ function local_dir_update($uid,$force) {
 	);
 
 	$profile = array();
+	$profile['encoding'] = 'zot';
 
 	if($p) {
 		$hash = $p[0]['channel_hash'];
diff --git a/include/items.php b/include/items.php
index 10daa85f2..679c24dc1 100755
--- a/include/items.php
+++ b/include/items.php
@@ -838,6 +838,7 @@ function import_author_rss($x) {
 function encode_item($item) {
 	$x = array();
 	$x['type'] = 'activity';
+	$x['encoding'] = 'zot';
 
 //	logger('encode_item: ' . print_r($item,true));
 
@@ -1069,6 +1070,7 @@ function encode_item_flags($item) {
 function encode_mail($item) {
 	$x = array();
 	$x['type'] = 'mail';
+	$x['encoding'] = 'zot';
 
 	if(array_key_exists('mail_flags',$item) && ($item['mail_flags'] & MAIL_OBSCURED)) {
 		$key = get_config('system','prvkey');
diff --git a/include/nav.php b/include/nav.php
index 80e4955e5..8133ecf67 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -34,6 +34,10 @@ EOT;
 	if(local_user()) {
 		$channel = $a->get_channel();
 		$observer = $a->get_observer();
+		$prof = q("select id from profile where uid = %d and is_default = 1",
+			intval($channel['channel_id'])
+		);
+
 	}
 	elseif(remote_user())
 		$observer = $a->get_observer();
@@ -81,6 +85,9 @@ EOT;
 		$nav['usermenu'][] = Array('profile/' . $channel['channel_address'], t('View Profile'), "", t('Your profile page'));
 		if(feature_enabled(local_user(),'multi_profiles'))
 			$nav['usermenu'][]   = Array('profiles', t('Edit Profiles'),"", t('Manage/Edit profiles'));
+		else
+			$nav['usermenu'][]   = Array('profiles/' . $prof[0]['id'], t('Edit Profile'),"", t('Edit your profile'));
+
 		$nav['usermenu'][] = Array('photos/' . $channel['channel_address'], t('Photos'), "", t('Your photos'));
 		$nav['usermenu'][] = Array('cloud/' . $channel['channel_address'],t('Files'),"",t('Your files'));
 
diff --git a/include/zot.php b/include/zot.php
index 0fbeed519..5df217c03 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -1648,11 +1648,6 @@ function delete_imported_item($sender,$item,$uid) {
 		
 	require_once('include/items.php');
 
-	// FIXME issue #230 is related
-	// Chicken/egg problem because we have to drop_item, but this removes information that tag_deliver may need to do its stuff.
-	// We can't reverse the order because drop_item refuses to run if the item already has the deleted flag set and we need to
-	// set that flag prior to calling tag_deliver.
-
 	// Use phased deletion to set the deleted flag, call both tag_deliver and the notifier to notify downstream channels
 	// and then clean up after ourselves with a cron job after several days to do the delete_item_lowlevel() (DROPITEM_PHASE2).
 
@@ -2104,6 +2099,7 @@ function build_sync_packet($uid = 0, $packet = null, $groups_changed = false) {
 
 	$info = (($packet) ? $packet : array());
 	$info['type'] = 'channel_sync';
+	$info['encoding'] = 'red'; // note: not zot, this packet is very red specific
 
 	if(array_key_exists($uid,$a->config) && array_key_exists('transient',$a->config[$uid])) {
 		$settings = $a->config[$uid]['transient'];