diff options
-rw-r--r-- | application/Updater.php | 2 | ||||
-rw-r--r-- | index.php | 4 | ||||
-rw-r--r-- | tpl/default/tools.html | 11 |
3 files changed, 7 insertions, 10 deletions
diff --git a/application/Updater.php b/application/Updater.php index c2aa1568..480bff82 100644 --- a/application/Updater.php +++ b/application/Updater.php | |||
@@ -502,7 +502,7 @@ class Updater | |||
502 | return true; | 502 | return true; |
503 | } | 503 | } |
504 | 504 | ||
505 | $thumbnailsEnabled = $this->conf->get('thumbnail.enable_thumbnails', true); | 505 | $thumbnailsEnabled = extension_loaded('gd') && $this->conf->get('thumbnail.enable_thumbnails', true); |
506 | $this->conf->set('thumbnails.mode', $thumbnailsEnabled ? Thumbnailer::MODE_ALL : Thumbnailer::MODE_NONE); | 506 | $this->conf->set('thumbnails.mode', $thumbnailsEnabled ? Thumbnailer::MODE_ALL : Thumbnailer::MODE_NONE); |
507 | $this->conf->set('thumbnails.width', 125); | 507 | $this->conf->set('thumbnails.width', 125); |
508 | $this->conf->set('thumbnails.height', 90); | 508 | $this->conf->set('thumbnails.height', 90); |
@@ -1635,9 +1635,9 @@ function buildLinkList($PAGE, $LINKSDB, $conf, $pluginManager, $loginManager) | |||
1635 | uasort($taglist, 'strcasecmp'); | 1635 | uasort($taglist, 'strcasecmp'); |
1636 | $link['taglist'] = $taglist; | 1636 | $link['taglist'] = $taglist; |
1637 | 1637 | ||
1638 | // Thumbnails enabled, not a note, | 1638 | // Logged in, thumbnails enabled, not a note, |
1639 | // and (never retrieved yet or no valid cache file) | 1639 | // and (never retrieved yet or no valid cache file) |
1640 | if ($thumbnailsEnabled && $link['url'][0] != '?' | 1640 | if ($loginManager->isLoggedIn() && $thumbnailsEnabled && $link['url'][0] != '?' |
1641 | && (! isset($link['thumbnail']) || ($link['thumbnail'] !== false && ! is_file($link['thumbnail']))) | 1641 | && (! isset($link['thumbnail']) || ($link['thumbnail'] !== false && ! is_file($link['thumbnail']))) |
1642 | ) { | 1642 | ) { |
1643 | $elem = $LINKSDB[$keys[$i]]; | 1643 | $elem = $LINKSDB[$keys[$i]]; |
diff --git a/tpl/default/tools.html b/tpl/default/tools.html index 6b4d7bec..c9ce1eaf 100644 --- a/tpl/default/tools.html +++ b/tpl/default/tools.html | |||
@@ -125,25 +125,22 @@ | |||
125 | <div class="pure-u-lg-1-3 pure-u-22-24 page-form page-form-light"> | 125 | <div class="pure-u-lg-1-3 pure-u-22-24 page-form page-form-light"> |
126 | <h2 class="window-title">{'3rd party'|t}</h2> | 126 | <h2 class="window-title">{'3rd party'|t}</h2> |
127 | <div class="tools-item"> | 127 | <div class="tools-item"> |
128 | <a href="https://addons.mozilla.org/fr/firefox/addon/shaarli/" title="Firefox {'Plugin'|t}"> | 128 | <a href="https://addons.mozilla.org/fr/firefox/addon/shaarli/"> |
129 | <span class="pure-button pure-u-lg-2-3 pure-u-3-4">Firefox {'plugin'|t}</span> | 129 | <span class="pure-button pure-u-lg-2-3 pure-u-3-4">Firefox {'plugin'|t}</span> |
130 | </a> | 130 | </a> |
131 | </div> | 131 | </div> |
132 | <div class="tools-item"> | 132 | <div class="tools-item"> |
133 | <a href="https://chrome.google.com/webstore/detail/shiny-shaarli/hajdfkmbdmadjmmpkkbbcnllepomekin" | 133 | <a href="https://chrome.google.com/webstore/detail/shiny-shaarli/hajdfkmbdmadjmmpkkbbcnllepomekin"> |
134 | title="Chrome {'Plugin'|t}"> | ||
135 | <span class="pure-button pure-u-lg-2-3 pure-u-3-4">Chrome {'plugin'|t}</span> | 134 | <span class="pure-button pure-u-lg-2-3 pure-u-3-4">Chrome {'plugin'|t}</span> |
136 | </a> | 135 | </a> |
137 | </div> | 136 | </div> |
138 | <div class="tools-item"> | 137 | <div class="tools-item"> |
139 | <a href="https://play.google.com/store/apps/details?id=com.dimtion.shaarlier&hl=fr" | 138 | <a href="https://play.google.com/store/apps/details?id=com.dimtion.shaarlier&hl=fr"> |
140 | title="Android Shaarlier"> | ||
141 | <span class="pure-button pure-u-lg-2-3 pure-u-3-4">Android Shaarlier</span> | 139 | <span class="pure-button pure-u-lg-2-3 pure-u-3-4">Android Shaarlier</span> |
142 | </a> | 140 | </a> |
143 | </div> | 141 | </div> |
144 | <div class="tools-item"> | 142 | <div class="tools-item"> |
145 | <a href="https://stakali.toneiv.eu/" | 143 | <a href="https://stakali.toneiv.eu/"> |
146 | title="Android Stakali"> | ||
147 | <span class="pure-button pure-u-lg-2-3 pure-u-3-4">Android Stakali</span> | 144 | <span class="pure-button pure-u-lg-2-3 pure-u-3-4">Android Stakali</span> |
148 | </a> | 145 | </a> |
149 | </div> | 146 | </div> |