X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=application%2FUpdater.php;h=480bff8267956ad82e12d3a4169e7b09f60ee135;hb=bede8e1b633d720d6a7d1b05ba367811f3ac2b87;hp=f6b9e205d61ba29c33a23cdd998b57ba3218ed74;hpb=28f26524609338316cc6e51c743058e6e8c7b12b;p=github%2Fshaarli%2FShaarli.git
diff --git a/application/Updater.php b/application/Updater.php
index f6b9e205..480bff82 100644
--- a/application/Updater.php
+++ b/application/Updater.php
@@ -2,6 +2,7 @@
use Shaarli\Config\ConfigJson;
use Shaarli\Config\ConfigPhp;
use Shaarli\Config\ConfigManager;
+use Shaarli\Thumbnailer;
/**
* Class Updater.
@@ -497,12 +498,12 @@ class Updater
*/
public function updateMethodWebThumbnailer()
{
- if ($this->conf->exists('thumbnails.enabled')) {
+ if ($this->conf->exists('thumbnails.mode')) {
return true;
}
- $thumbnailsEnabled = $this->conf->get('thumbnail.enable_thumbnails', true);
- $this->conf->set('thumbnails.enabled', $thumbnailsEnabled);
+ $thumbnailsEnabled = extension_loaded('gd') && $this->conf->get('thumbnail.enable_thumbnails', true);
+ $this->conf->set('thumbnails.mode', $thumbnailsEnabled ? Thumbnailer::MODE_ALL : Thumbnailer::MODE_NONE);
$this->conf->set('thumbnails.width', 125);
$this->conf->set('thumbnails.height', 90);
$this->conf->remove('thumbnail');
@@ -510,7 +511,7 @@ class Updater
if ($thumbnailsEnabled) {
$this->session['warnings'][] = t(
- 'You have enabled thumbnails. Please synchonize them.'
+ 'You have enabled or changed thumbnails mode. Please synchronize them.'
);
}