Merge remote-tracking branch 'upstream/dev' into dev

Zotlabs/Module/Directory.php

@@ -68,6 +68,7 @@ class Directory extends \Zotlabs\Web\Controller {
 		$observer = get_observer_hash();
 	
 		$globaldir = get_directory_setting($observer, 'globaldir');
+
 		// override your personal global search pref if we're doing a navbar search of the directory
 		if(intval($_REQUEST['navsearch']))
 			$globaldir = 1;

include/zot.php

@@ -1782,7 +1782,7 @@ function process_delivery($sender, $arr, $deliveries, $relay, $public = false, $
 					$result[] = $DR->get();
 				}
 				else {
-					update_imported_item($sender,$arr,$r[0],$channel['channel_id']);
+					update_imported_item($sender,$arr,$r[0],$channel['channel_id'],$tag_delivery);
 					$DR->update('updated');
 					$result[] = $DR->get();
 					if(! $relay)
@@ -1930,7 +1930,7 @@ function remove_community_tag($sender, $arr, $uid) {
  * @param int $uid
  */
 
-function update_imported_item($sender, $item, $orig, $uid) {
+function update_imported_item($sender, $item, $orig, $uid, $tag_delivery) {
 
 	// If this is a comment being updated, remove any privacy information
 	// so that item_store_update will set it from the original.
@@ -1943,6 +1943,15 @@ function update_imported_item($sender, $item, $orig, $uid) {
 		unset($item['item_private']);
 	}
 
+	// we need the tag_delivery check for downstream flowing posts as the stored post 
+	// may have a different owner than the one being transmitted. 
+
+	if(($sender['hash'] != $orig['owner_xchan'] && $sender['hash'] != $orig['author_xchan']) && (! $tag_delivery)) {
+		notice('sender is not owner or author');
+		return;
+	}
+
+
 	$x = item_store_update($item);
 
 	// If we're updating an event that we've saved locally, we store the item info first

view/js/main.js

@@ -434,12 +434,12 @@ function contextualHelp() {
 
 	if(container.hasClass('contextual-help-content-open')) {
 		container.removeClass('contextual-help-content-open');
-		$('main').css('top', '')
+		$('main').css('margin-top', '')
 	}
 	else {
 		container.addClass('contextual-help-content-open');
 		var mainTop = container.outerHeight(true);
-		$('main').css('top', mainTop + 'px');
+		$('main').css('margin-top', mainTop + 'px');
 	}
 }
 

view/theme/redbasic/js/redbasic.js

@@ -30,7 +30,7 @@ $(document).ready(function() {
 		}
 	});
 
-	if($('aside').length && $('aside').html().length === 0) {
+	if($('#left_aside_wrapper').length && $('#left_aside_wrapper').html().length === 0) {
 		$('#expand-aside').hide();
 	}
 

view/tpl/peoplefind.tpl

@@ -1,7 +1,6 @@
 <div id="peoplefind-sidebar" class="widget">
 	<h3>{{$findpeople}}</h3>
 	<form action="directory" method="post" />
-		<input type="hidden" name="navsearch" value="1" />
 		<div class="form-group">
 			<div class="input-group">
 				<input class="widget-input" type="text" name="search" title="{{$hint}}{{if $advanced_search}}{{$advanced_hint}}{{/if}}" placeholder="{{$desc}}" />