11 files changed, 48 insertions, 15 deletions

diff --git a/README.md b/README.md
index d67c10ac..d8328d83 100644
--- a/README.md
+++ b/README.md
@@ -26,6 +26,7 @@ Login: `demo`; Password: `demo`
 
 ### Installation & upgrade
 - [Download](https://github.com/shaarli/Shaarli/wiki/Download)
+- [Upgrade and migration](https://github.com/shaarli/Shaarli/wiki/Upgrade-and-migration)
 - [Server requirements](https://github.com/shaarli/Shaarli/wiki/Server-requirements)
 - [Server configuration](https://github.com/shaarli/Shaarli/wiki/Server-configuration)
 - [Shaarli configuration](https://github.com/shaarli/Shaarli/wiki/Shaarli-configuration)
diff --git a/application/LinkDB.php b/application/LinkDB.php
index 1cb70de0..b1072e07 100644
--- a/application/LinkDB.php
+++ b/application/LinkDB.php
@@ -440,11 +440,18 @@ You use the community supported version of the original Shaarli project, by Seba
     public function allTags()
     {
         $tags = array();
+        $caseMapping = array();
         foreach ($this->_links as $link) {
             foreach (explode(' ', $link['tags']) as $tag) {
-                if (!empty($tag)) {
-                    $tags[$tag] = (empty($tags[$tag]) ? 1 : $tags[$tag] + 1);
+                if (empty($tag)) {
+                    continue;
                 }
+                // The first case found will be displayed.
+                if (!isset($caseMapping[strtolower($tag)])) {
+                    $caseMapping[strtolower($tag)] = $tag;
+                    $tags[$caseMapping[strtolower($tag)]] = 0;
+                }
+                $tags[$caseMapping[strtolower($tag)]]++;
             }
         }
         // Sort tags by usage (most used tag first)
diff --git a/application/Url.php b/application/Url.php
index 77447c8d..c166ff6e 100644
--- a/application/Url.php
+++ b/application/Url.php
@@ -99,6 +99,7 @@ class Url
         'action_type_map=',
         'fb_',
         'fb=',
+        'PHPSESSID=',
 
         // Scoop.it
         '__scoop',
diff --git a/composer.json b/composer.json
index 2ded0920..e419dc11 100644
--- a/composer.json
+++ b/composer.json
@@ -1,11 +1,17 @@
 {
     "name": "shaarli/shaarli",
-    "description": "The personal, minimalist, super-fast, no-database delicious clone",
+    "description": "The personal, minimalist, super-fast, database-free bookmarking service",
+    "type": "project",
     "license": "MIT",
+    "homepage": "https://github.com/shaarli/Shaarli",
     "support": {
-        "issues": "https://github.com/shaarli/Shaarli/issues"
+        "issues": "https://github.com/shaarli/Shaarli/issues",
+        "wiki": "https://github.com/shaarli/Shaarli/wiki"
+    },
+    "keywords": ["bookmark", "link", "share", "web"],
+    "require": {
+        "php": ">=5.3.4"
     },
-    "require": {},
     "require-dev": {
         "phpmd/phpmd" : "@stable",
         "phpunit/phpunit": "4.8.*",
diff --git a/plugins/markdown/markdown.php b/plugins/markdown/markdown.php
index 57fcce32..5f56ecc2 100644
--- a/plugins/markdown/markdown.php
+++ b/plugins/markdown/markdown.php
@@ -10,9 +10,8 @@ require_once 'Parsedown.php';
 
 /*
  * If this tag is used on a shaare, the description won't be processed by Parsedown.
- * Using a private tag so it won't appear for visitors.
  */
-define('NO_MD_TAG', '.nomarkdown');
+define('NO_MD_TAG', 'nomarkdown');
 
 /**
  * Parse linklist descriptions.
@@ -25,11 +24,11 @@ function hook_markdown_render_linklist($data)
 {
     foreach ($data['links'] as &$value) {
         if (!empty($value['tags']) && noMarkdownTag($value['tags'])) {
+            $value['taglist'] = stripNoMarkdownTag($value['taglist']);
             continue;
         }
         $value['description'] = process_markdown($value['description']);
     }
-
     return $data;
 }
 
@@ -44,6 +43,7 @@ function hook_markdown_render_feed($data)
 {
     foreach ($data['links'] as &$value) {
         if (!empty($value['tags']) && noMarkdownTag($value['tags'])) {
+            $value['tags'] = stripNoMarkdownTag($value['tags']);
             continue;
         }
         $value['description'] = process_markdown($value['description']);
@@ -87,6 +87,19 @@ function noMarkdownTag($tags)
 }
 
 /**
+ * Remove the no-markdown meta tag so it won't be displayed.
+ *
+ * @param string $tags Tag list.
+ *
+ * @return string tag list without no markdown tag.
+ */
+function stripNoMarkdownTag($tags)
+{
+    unset($tags[array_search(NO_MD_TAG, $tags)]);
+    return array_values($tags);
+}
+
+/**
  * When link list is displayed, include markdown CSS.
  *
  * @param array $data includes data.
diff --git a/tests/FeedBuilderTest.php b/tests/FeedBuilderTest.php
index a4d6960c..460fb0c5 100644
--- a/tests/FeedBuilderTest.php
+++ b/tests/FeedBuilderTest.php
@@ -93,7 +93,7 @@ class FeedBuilderTest extends PHPUnit_Framework_TestCase
         $this->assertContains('Permalink', $link['description']);
         $this->assertContains('http://host.tld/?WDWyig', $link['description']);
         $this->assertEquals(1, count($link['taglist']));
-        $this->assertEquals('stuff', $link['taglist'][0]);
+        $this->assertEquals('sTuff', $link['taglist'][0]);
 
         // Test URL with external link.
         $this->assertEquals('https://static.fsf.org/nosvn/faif-2.0.pdf', $data['links']['20150310_114633']['url']);
diff --git a/tests/LinkDBTest.php b/tests/LinkDBTest.php
index 956be3b4..9c64188f 100644
--- a/tests/LinkDBTest.php
+++ b/tests/LinkDBTest.php
@@ -290,7 +290,9 @@ class LinkDBTest extends PHPUnit_Framework_TestCase
                 'stallman' => 1,
                 'free' => 1,
                 '-exclude' => 1,
-                'stuff' => 2,
+                // The DB contains a link with `sTuff` and another one with `stuff` tag.
+                // They need to be grouped with the first case found (`sTuff`).
+                'sTuff' => 2,
             ),
             self::$publicLinkDB->allTags()
         );
@@ -310,7 +312,7 @@ class LinkDBTest extends PHPUnit_Framework_TestCase
                 'w3c' => 1,
                 'css' => 1,
                 'Mercurial' => 1,
-                'stuff' => 2,
+                'sTuff' => 2,
                 '-exclude' => 1,
                 '.hidden' => 1,
             ),
diff --git a/tests/Url/UrlTest.php b/tests/Url/UrlTest.php
index ce82265e..4bf53b2d 100644
--- a/tests/Url/UrlTest.php
+++ b/tests/Url/UrlTest.php
@@ -85,6 +85,7 @@ class UrlTest extends PHPUnit_Framework_TestCase
         $this->assertUrlIsCleaned('?utm_term=1n4l');
 
         $this->assertUrlIsCleaned('?xtor=some-url');
+        $this->assertUrlIsCleaned('?PHPSESSID=012345678910111213');
     }
 
     /**
diff --git a/tests/plugins/PluginMarkdownTest.php b/tests/plugins/PluginMarkdownTest.php
index fa7e1d52..3593a556 100644
--- a/tests/plugins/PluginMarkdownTest.php
+++ b/tests/plugins/PluginMarkdownTest.php
@@ -125,7 +125,8 @@ class PluginMarkdownTest extends PHPUnit_Framework_TestCase
         $data = array(
             'links' => array(array(
                 'description' => $str,
-                'tags' => NO_MD_TAG
+                'tags' => NO_MD_TAG,
+                'taglist' => array(NO_MD_TAG),
             ))
         );
 
@@ -140,7 +141,8 @@ class PluginMarkdownTest extends PHPUnit_Framework_TestCase
                     // nth link
                     0 => array(
                         'formatedDescription' => $str,
-                        'tags' => NO_MD_TAG
+                        'tags' => NO_MD_TAG,
+                        'taglist' => array(),
                     ),
                 ),
             ),
diff --git a/tests/utils/ReferenceLinkDB.php b/tests/utils/ReferenceLinkDB.php
index dc4f5dfa..46165b4d 100644
--- a/tests/utils/ReferenceLinkDB.php
+++ b/tests/utils/ReferenceLinkDB.php
@@ -21,7 +21,7 @@ class ReferenceLinkDB
             'Stallman has a beard and is part of the Free Software Foundation (or not). Seriously, read this.',
             0,
             '20150310_114651',
-            'stuff'
+            'sTuff'
         );
 
         $this->addLink(
diff --git a/tpl/tools.html b/tpl/tools.html
index 29ade725..9e45caad 100644
--- a/tpl/tools.html
+++ b/tpl/tools.html
@@ -79,7 +79,7 @@
                                         icon32URL: baseURL + "/images/favicon.ico",
                                         icon64URL: baseURL + "/images/favicon.ico",
 
-                                        shareURL: baseURL + "{noparse}?post=%{url}&title=%{title}&description=%{description}&source=firefoxsocialapi{/noparse}",
+                                        shareURL: baseURL + "{noparse}?post=%{url}&title=%{title}&description=%{text}&source=firefoxsocialapi{/noparse}",
                                         homepageURL: baseURL
                                 };
                                 node.setAttribute("data-service", JSON.stringify(data));