aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorArthurHoaro <arthur@hoa.ro>2020-06-25 13:57:51 +0200
committerGitHub <noreply@github.com>2020-06-25 13:57:51 +0200
commit15d31c39eceee9ab15b15606c559112363f7ca3f (patch)
treef58a23d7062079ac53b4252ae58a05e2bbbaa1ff
parentd63ff87a009313141ae684ec447b902562ff6ee7 (diff)
parent2458791e4e1c3b2c20913cb4b38ec34385fb336e (diff)
downloadShaarli-15d31c39eceee9ab15b15606c559112363f7ca3f.tar.gz
Shaarli-15d31c39eceee9ab15b15606c559112363f7ca3f.tar.zst
Shaarli-15d31c39eceee9ab15b15606c559112363f7ca3f.zip
Merge pull request #1426 from aguytech/v0.11-fixesv0.11
-rw-r--r--application/http/UrlUtils.php2
-rw-r--r--index.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/application/http/UrlUtils.php b/application/http/UrlUtils.php
index 4bc84b82..e8d1a283 100644
--- a/application/http/UrlUtils.php
+++ b/application/http/UrlUtils.php
@@ -73,7 +73,7 @@ function add_trailing_slash($url)
73 */ 73 */
74function whitelist_protocols($url, $protocols) 74function whitelist_protocols($url, $protocols)
75{ 75{
76 if (startsWith($url, '?') || startsWith($url, '/')) { 76 if (startsWith($url, '?') || startsWith($url, '/') || startsWith($url, '#')) {
77 return $url; 77 return $url;
78 } 78 }
79 $protocols = array_merge(['http', 'https'], $protocols); 79 $protocols = array_merge(['http', 'https'], $protocols);
diff --git a/index.php b/index.php
index 9e473936..6ec5507e 100644
--- a/index.php
+++ b/index.php
@@ -465,7 +465,7 @@ function showDaily($pageBuilder, $LINKSDB, $conf, $pluginManager, $loginManager)
465 // Description: 836 characters gives roughly 342 pixel height. 465 // Description: 836 characters gives roughly 342 pixel height.
466 // This is not perfect, but it's usually OK. 466 // This is not perfect, but it's usually OK.
467 $length = strlen($link['title']) + (342 * strlen($link['description'])) / 836; 467 $length = strlen($link['title']) + (342 * strlen($link['description'])) / 836;
468 if ($link['thumbnail']) { 468 if (!empty($link['thumbnail'])) {
469 $length += 100; // 1 thumbnails roughly takes 100 pixels height. 469 $length += 100; // 1 thumbnails roughly takes 100 pixels height.
470 } 470 }
471 // Then put in column which is the less filled: 471 // Then put in column which is the less filled: