aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Manning <tamanning@zoho.com>2017-01-01 07:41:36 -0500
committerAndrew Manning <tamanning@zoho.com>2017-01-01 07:41:36 -0500
commitce87a0c1d331a9e1a1975807ab6f077a84f4a7aa (patch)
tree6d8db4c43a7bbe084968c8b377dde336266e7830
parent2ba23ebb136b222b59bd0d59e9f606b3b5e4572c (diff)
parente2eb0b2eac6f32a0e4781eabbb147f0bee0736fb (diff)
downloadvolse-hubzilla-ce87a0c1d331a9e1a1975807ab6f077a84f4a7aa.tar.gz
volse-hubzilla-ce87a0c1d331a9e1a1975807ab6f077a84f4a7aa.tar.bz2
volse-hubzilla-ce87a0c1d331a9e1a1975807ab6f077a84f4a7aa.zip
Merge remote-tracking branch 'upstream/dev' into dev
-rw-r--r--Zotlabs/Module/Directory.php1
-rw-r--r--include/zot.php13
-rw-r--r--view/js/main.js4
-rw-r--r--view/theme/redbasic/js/redbasic.js2
-rwxr-xr-xview/tpl/peoplefind.tpl1
5 files changed, 15 insertions, 6 deletions
diff --git a/Zotlabs/Module/Directory.php b/Zotlabs/Module/Directory.php
index 76f1937a2..59ae88857 100644
--- a/Zotlabs/Module/Directory.php
+++ b/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;
diff --git a/include/zot.php b/include/zot.php
index 853c8eb9e..96ec71112 100644
--- a/include/zot.php
+++ b/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
diff --git a/view/js/main.js b/view/js/main.js
index 5f961f6e9..c67f1c167 100644
--- a/view/js/main.js
+++ b/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');
}
}
diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js
index b7993ce90..395385411 100644
--- a/view/theme/redbasic/js/redbasic.js
+++ b/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();
}
diff --git a/view/tpl/peoplefind.tpl b/view/tpl/peoplefind.tpl
index 0b7f792a6..ae0b7f1ea 100755
--- a/view/tpl/peoplefind.tpl
+++ b/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}}" />