Merge pull request #618 from ArthurHoaro/tagclean

Better whitespace handling in tags
shaarli · Aug 2, 2016 · 58f0660 · 58f0660
2 parents efc0c86 + 9866b40
commit 58f0660
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/application/LinkDB.php b/application/LinkDB.php
@@ -291,7 +291,7 @@ private function _readDB()
 
             // 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)]+\s*/', ' ', $link['tags']);
             }
 
             // Do not use the redirector for internal links (Shaarli note URL starting with a '?').
@@ -442,7 +442,7 @@ public function allTags()
         $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;
                 }

diff --git a/tests/LinkDBTest.php b/tests/LinkDBTest.php
@@ -317,6 +317,10 @@ public function testAllTags()
                 '-exclude' => 1,
                 '.hidden' => 1,
                 'hashtag' => 2,
+                'tag1' => 1,
+                'tag2' => 1,
+                'tag3' => 1,
+                'tag4' => 1,
             ),
             self::$privateLinkDB->allTags()
         );

diff --git a/tests/utils/ReferenceLinkDB.php b/tests/utils/ReferenceLinkDB.php
@@ -75,7 +75,7 @@ function __construct()
             '',
             1,
             '20121206_182539',
-            'dev cartoon'
+            'dev cartoon tag1  tag2   tag3  tag4   '
         );
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -75,7 +75,7 @@ function __construct() @@
                 '',
 ,
                 '20121206_182539',
-                'dev cartoon'
+                'dev cartoon tag1  tag2   tag3  tag4   '
             );
         }
@@ Expand Down @@