diff options
| -rw-r--r-- | include/items.php | 1 | ||||
| -rw-r--r-- | mod/item.php | 6 | ||||
| -rw-r--r-- | mod/search.php | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/include/items.php b/include/items.php index b5e901c91..c5857f7fd 100644 --- a/include/items.php +++ b/include/items.php @@ -674,7 +674,6 @@ function dfrn_deliver($owner,$contact,$atom) { $final_dfrn_id = ''; - if(($contact['duplex'] && strlen($contact['prvkey'])) || ($owner['page-flags'] == PAGE_COMMUNITY)) { openssl_private_decrypt($sent_dfrn_id,$final_dfrn_id,$contact['prvkey']); openssl_private_decrypt($challenge,$postvars['challenge'],$contact['prvkey']); diff --git a/mod/item.php b/mod/item.php index 4b95f2d9b..77fdd4a21 100644 --- a/mod/item.php +++ b/mod/item.php @@ -122,11 +122,11 @@ function item_post(&$a) { if(count($tags)) { foreach($tags as $tag) { if(strpos($tag,'#') === 0) { - $basetag = substr($tag,1); - $body = str_replace($tag,'#[url=' . $a->get_baseurl() . '/search?search=' . urlencode($basetag) . ']' . $basetag . '[/url]',$body); + $basetag = str_replace('_',' ',substr($tag,1)); + $body = str_replace($tag,'#[url=' . $a->get_baseurl() . '/search?search=' . rawurlencode($basetag) . ']' . $basetag . '[/url]',$body); if(strlen($str_tags)) $str_tags .= ','; - $str_tags .= '#[url=' . $a->get_baseurl() . '/search?search=' . urlencode($basetag) . ']' . $basetag . '[/url]'; + $str_tags .= '#[url=' . $a->get_baseurl() . '/search?search=' . rawurlencode($basetag) . ']' . $basetag . '[/url]'; continue; } if(strpos($tag,'@') === 0) { diff --git a/mod/search.php b/mod/search.php index 19bf6b964..78a4a3d53 100644 --- a/mod/search.php +++ b/mod/search.php @@ -7,7 +7,7 @@ function search_content(&$a) { $o .= '<h3>' . t('Search') . '</h3>'; - $search = ((x($_GET,'search')) ? $_GET['search'] : ''); + $search = ((x($_GET,'search')) ? rawurldecode($_GET['search']) : ''); $o .= search($search); |