From 4b35853d6869e65b473fec065361e9ea7dbcf94d Mon Sep 17 00:00:00 2001 From: Chris Kuethe Date: Thu, 19 May 2016 11:33:45 -0700 Subject: Better whitespace handling in tags. Fixes #571 --- application/LinkDB.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/application/LinkDB.php b/application/LinkDB.php index 929a6b0f..e9d216ea 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 // Remove private tags if the user is not logged in. if (! $this->_loggedIn) { - $link['tags'] = preg_replace('/(^| )\.[^($| )]+/', '', $link['tags']); + $link['tags'] = preg_replace('/(^|\s*)\.[^($| )]+\s*$/', '', $link['tags']); } // 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 $tags = array(); $caseMapping = array(); foreach ($this->_links as $link) { - foreach (explode(' ', $link['tags']) as $tag) { + foreach (preg_split('/\s+/', $link['tags'], 0, PREG_SPLIT_NO_EMPTY) as $tag) { if (empty($tag)) { continue; } -- cgit v1.2.3