tag search boolean mode

diff --git a/include/items.php b/include/items.php
index b5e901c91131c236b908acc80dcd2fb20bbda4fc..c5857f7fd3cb1e571620f434bc81794e559ab454 100644 (file)
--- 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 4b95f2d9b39edefb84557bfb540e8fcac698db69..77fdd4a21d72a9ad62cdb559023a6bd3c4cd3d75 100644 (file)
--- 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 19bf6b964f6a605bff86287a57b7141f085a855e..78a4a3d53f61de99c70a668ee85eaaaff0ddceef 100644 (file)
--- 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);