diff options
author | VirtualTam <virtualtam@flibidi.net> | 2016-08-02 15:37:43 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-08-02 15:37:43 +0200 |
commit | 58f0660f80b8f6fa29f7ffa99a33edc76d841850 (patch) | |
tree | 2ab5f36db51fb71188c4d978682027f8e1a7e707 /application/LinkDB.php | |
parent | efc0c865ba914e75a6c3c9220450d13f752c7afa (diff) | |
parent | 9866b40814a120f1a019f9f2c8ef66f44e1ddfcb (diff) | |
download | Shaarli-58f0660f80b8f6fa29f7ffa99a33edc76d841850.tar.gz Shaarli-58f0660f80b8f6fa29f7ffa99a33edc76d841850.tar.zst Shaarli-58f0660f80b8f6fa29f7ffa99a33edc76d841850.zip |
Merge pull request #618 from ArthurHoaro/tagclean
Better whitespace handling in tags
Diffstat (limited to 'application/LinkDB.php')
-rw-r--r-- | application/LinkDB.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/application/LinkDB.php b/application/LinkDB.php index 929a6b0f..d80434bf 100644 --- a/application/LinkDB.php +++ b/application/LinkDB.php | |||
@@ -291,7 +291,7 @@ You use the community supported version of the original Shaarli project, by Seba | |||
291 | 291 | ||
292 | // Remove private tags if the user is not logged in. | 292 | // Remove private tags if the user is not logged in. |
293 | if (! $this->_loggedIn) { | 293 | if (! $this->_loggedIn) { |
294 | $link['tags'] = preg_replace('/(^| )\.[^($| )]+/', '', $link['tags']); | 294 | $link['tags'] = preg_replace('/(^|\s+)\.[^($|\s)]+\s*/', ' ', $link['tags']); |
295 | } | 295 | } |
296 | 296 | ||
297 | // Do not use the redirector for internal links (Shaarli note URL starting with a '?'). | 297 | // Do not use the redirector for internal links (Shaarli note URL starting with a '?'). |
@@ -442,7 +442,7 @@ You use the community supported version of the original Shaarli project, by Seba | |||
442 | $tags = array(); | 442 | $tags = array(); |
443 | $caseMapping = array(); | 443 | $caseMapping = array(); |
444 | foreach ($this->_links as $link) { | 444 | foreach ($this->_links as $link) { |
445 | foreach (explode(' ', $link['tags']) as $tag) { | 445 | foreach (preg_split('/\s+/', $link['tags'], 0, PREG_SPLIT_NO_EMPTY) as $tag) { |
446 | if (empty($tag)) { | 446 | if (empty($tag)) { |
447 | continue; | 447 | continue; |
448 | } | 448 | } |