From: Sébastien SAUVAGE <sebsauvage@sebsauvage.net>
Date: Tue, 24 Sep 2013 09:03:26 +0000 (-0700)
Subject: Merge pull request #125 from broncowdd/master
X-Git-Tag: v0.0.42beta~19
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=c4bbb010643c265131f9b0c1aba76f3b12561c06;hp=fdc3c114d1617578e388147af138e8470d7b20b3;p=github%2Fshaarli%2FShaarli.git

Merge pull request #125 from broncowdd/master

Added the possibility to put a description in the bookmarklet's URL
---

diff --git a/index.php b/index.php
index b402eba9..d3e105f9 100644
--- a/index.php
+++ b/index.php
@@ -1538,7 +1538,8 @@ function renderPage()
             $link_is_new = true;  // This is a new link
             $linkdate = strval(date('Ymd_His'));
             $title = (empty($_GET['title']) ? '' : $_GET['title'] ); // Get title if it was provided in URL (by the bookmarklet).
-            $description=''; $tags=''; $private=0;
+            $description = (empty($_GET['description']) ? '' : $_GET['description'] )."\n"; // Get description if it was provided in URL (by the bookmarklet). [Bronco added that]
+            $tags=''; $private=0;
             if (($url!='') && parse_url($url,PHP_URL_SCHEME)=='') $url = 'http://'.$url;
             // If this is an HTTP link, we try go get the page to extact the title (otherwise we will to straight to the edit form.)
             if (empty($title) && parse_url($url,PHP_URL_SCHEME)=='http')