diff options
| author | git-marijus <mario@mariovavti.com> | 2017-07-22 12:08:47 +0200 |
|---|---|---|
| committer | git-marijus <mario@mariovavti.com> | 2017-07-22 12:08:47 +0200 |
| commit | 363d8723260bfefb85611935fe60797f34e6db6a (patch) | |
| tree | e69e655cb06ecd182c6aca6ec358821dd0dec2af /Zotlabs | |
| parent | f4a4d70149b74a73faf5e777350d76946eeefe93 (diff) | |
| parent | 992f8272d38b9ee73cc9facbe473665713f6ff2d (diff) | |
| download | volse-hubzilla-363d8723260bfefb85611935fe60797f34e6db6a.tar.gz volse-hubzilla-363d8723260bfefb85611935fe60797f34e6db6a.tar.bz2 volse-hubzilla-363d8723260bfefb85611935fe60797f34e6db6a.zip | |
Merge remote-tracking branch 'mike/master' into dev
Diffstat (limited to 'Zotlabs')
| -rw-r--r-- | Zotlabs/Module/Channel.php | 4 | ||||
| -rw-r--r-- | Zotlabs/Module/Network.php | 4 | ||||
| -rw-r--r-- | Zotlabs/Module/Search.php | 5 |
3 files changed, 7 insertions, 6 deletions
diff --git a/Zotlabs/Module/Channel.php b/Zotlabs/Module/Channel.php index bc4b3f782..a44984c97 100644 --- a/Zotlabs/Module/Channel.php +++ b/Zotlabs/Module/Channel.php @@ -325,8 +325,8 @@ class Channel extends \Zotlabs\Web\Controller { '$order' => '', '$list' => ((x($_REQUEST,'list')) ? intval($_REQUEST['list']) : 0), '$file' => '', - '$cats' => (($category) ? $category : ''), - '$tags' => (($hashtags) ? $hashtags : ''), + '$cats' => (($category) ? urlencode($category) : ''), + '$tags' => (($hashtags) ? urlencode($hashtags) : ''), '$mid' => $mid, '$verb' => '', '$dend' => $datequery, diff --git a/Zotlabs/Module/Network.php b/Zotlabs/Module/Network.php index 68e906c0e..45623c7b0 100644 --- a/Zotlabs/Module/Network.php +++ b/Zotlabs/Module/Network.php @@ -325,8 +325,8 @@ class Network extends \Zotlabs\Web\Controller { '$xchan' => $xchan, '$order' => $order, '$file' => $file, - '$cats' => $category, - '$tags' => $hashtags, + '$cats' => urlencode($category), + '$tags' => urlencode($hashtags), '$dend' => $datequery, '$mid' => '', '$verb' => $verb, diff --git a/Zotlabs/Module/Search.php b/Zotlabs/Module/Search.php index f95ae5e68..e1d35b879 100644 --- a/Zotlabs/Module/Search.php +++ b/Zotlabs/Module/Search.php @@ -81,11 +81,12 @@ class Search extends \Zotlabs\Web\Controller { return $o; if($tag) { - $sql_extra = sprintf(" AND item.id IN (select oid from term where otype = %d and ttype in ( %d , %d) and term = '%s') ", + $wildtag = str_replace('*','%',$search); + $sql_extra = sprintf(" AND item.id IN (select oid from term where otype = %d and ttype in ( %d , %d) and term like '%s') ", intval(TERM_OBJ_POST), intval(TERM_HASHTAG), intval(TERM_COMMUNITYTAG), - dbesc(protect_sprintf($search)) + dbesc(protect_sprintf($wildtag)) ); } else { |