aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-10-09 20:59:33 -0700
committerfriendica <info@friendica.com>2014-10-09 20:59:33 -0700
commit4634049549fb0ee7350bb6328f24b36c21a19855 (patch)
tree10ff593e8ed4216b02556ca26054e7e5226eac89
parentc78227292709f8f36206c7234dbf3548e476d442 (diff)
downloadvolse-hubzilla-4634049549fb0ee7350bb6328f24b36c21a19855.tar.gz
volse-hubzilla-4634049549fb0ee7350bb6328f24b36c21a19855.tar.bz2
volse-hubzilla-4634049549fb0ee7350bb6328f24b36c21a19855.zip
allow (our own) ajax urls to pass through bbcode intact.
-rw-r--r--include/bbcode.php4
-rwxr-xr-xinclude/items.php1
-rw-r--r--include/zot.php3
-rw-r--r--view/js/main.js10
4 files changed, 11 insertions, 7 deletions
diff --git a/include/bbcode.php b/include/bbcode.php
index d7a5ac457..6b7217f91 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -162,7 +162,7 @@ function bb_parse_app($match) {
function bb_parse_element($match) {
$j = json_decode(base64url_decode($match[1]),true);
if($j) {
- $o = EOL . '<a href="' . z_root() . '" foo="baz" onclick="importElement(\'' . $match[1] . '\'); return false;" >' . t('Install design element: ') . $j['pagetitle'] . '</a>' . EOL;
+ $o = EOL . '<a href="#" onclick="importElement(\'' . $match[1] . '\'); return false;" >' . t('Install design element: ') . $j['pagetitle'] . '</a>' . EOL;
}
return $o;
}
@@ -823,7 +823,7 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) {
// fix any escaped ampersands that may have been converted into links
$Text = preg_replace("/\<(.*?)(src|href)=(.*?)\&amp\;(.*?)\>/ism",'<$1$2=$3&$4>',$Text);
- $Text = preg_replace("/\<(.*?)(src|href)=\"[^hfm](.*?)\>/ism",'<$1$2="">',$Text);
+ $Text = preg_replace("/\<(.*?)(src|href)=\"[^hfm#](.*?)\>/ism",'<$1$2="">',$Text);
call_hooks('bbcode',$Text);
diff --git a/include/items.php b/include/items.php
index a930a7c3e..e64e91dc3 100755
--- a/include/items.php
+++ b/include/items.php
@@ -2072,6 +2072,7 @@ function item_store($arr,$allow_exec = false) {
return $ret;
}
+
// is the new message multi-level threaded?
// even though we don't support it now, preserve the info
// and re-attach to the conversation parent.
diff --git a/include/zot.php b/include/zot.php
index 9ea92aed8..63a5645d3 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -1472,11 +1472,12 @@ function process_delivery($sender,$arr,$deliveries,$relay,$public = false) {
$arr['uid'] = $channel['channel_id'];
update_imported_item($sender,$arr,$channel['channel_id']);
$result[] = array($d['hash'],'updated',$channel['channel_name'] . ' <' . $channel['channel_address'] . '@' . get_app()->get_hostname() . '>',$arr['mid']);
+ $item_id = $r[0]['id'];
}
else {
$result[] = array($d['hash'],'update ignored',$channel['channel_name'] . ' <' . $channel['channel_address'] . '@' . get_app()->get_hostname() . '>',$arr['mid']);
+ continue;
}
- $item_id = $r[0]['id'];
}
else {
$arr['aid'] = $channel['channel_account_id'];
diff --git a/view/js/main.js b/view/js/main.js
index 0560bc875..f58d3756b 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -896,12 +896,14 @@ function updateConvItems(mode,data) {
function importElement(elem) {
$.post(
"impel",
- { "element" : elem }
+ { "element" : elem },
+ function(data) {
+ if(timer) clearTimeout(timer);
+ timer = setTimeout(NavUpdate,10);
+ }
);
- if(timer) clearTimeout(timer);
- timer = setTimeout(NavUpdate,10);
- return true;
+ return false;
}
function preview_post() {