X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=application%2FLinkUtils.php;h=b5110edc490b645fdd124f760fa50e91caf7496d;hb=f24896b237e40718fb6eaa2869592eb0855a47fd;hp=c0dd32a66cfa0160e4b37160fdf226d4abb14499;hpb=d65342e304f92643ba922200953cfebc51e1e482;p=github%2Fshaarli%2FShaarli.git
diff --git a/application/LinkUtils.php b/application/LinkUtils.php
index c0dd32a6..b5110edc 100644
--- a/application/LinkUtils.php
+++ b/application/LinkUtils.php
@@ -1,5 +1,7 @@
$1', $text);
@@ -138,8 +150,9 @@ function text2clickable($text, $redirector = '')
// Redirector is set, urlencode the final URL.
return preg_replace_callback(
$regex,
- function ($matches) use ($redirector) {
- return ''. $matches[1] .'';
+ function ($matches) use ($redirector, $urlEncode) {
+ $url = $urlEncode ? urlencode($matches[1]) : $matches[1];
+ return ''. $matches[1] .'';
},
$text
);
@@ -185,12 +198,14 @@ function space2nbsp($text)
*
* @param string $description shaare's description.
* @param string $redirector if a redirector is set, use it to gerenate links.
+ * @param bool $urlEncode Use `urlencode()` on the URL after the redirector or not.
* @param string $indexUrl URL to Shaarli's index.
- *
+
* @return string formatted description.
*/
-function format_description($description, $redirector = '', $indexUrl = '') {
- return nl2br(space2nbsp(hashtag_autolink(text2clickable($description, $redirector), $indexUrl)));
+function format_description($description, $redirector = '', $urlEncode = true, $indexUrl = '')
+{
+ return nl2br(space2nbsp(hashtag_autolink(text2clickable($description, $redirector, $urlEncode), $indexUrl)));
}
/**