Bunch of improvement for thumbnails integration:

[github/shaarli/Shaarli.git] / application / Updater.php

diff --git a/application/Updater.php b/application/Updater.php
index f6b9e205d61ba29c33a23cdd998b57ba3218ed74..c2aa1568cdc01534a3e1efd885e494536884342e 100644 (file)
--- 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);
+        $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. <a href="?do=thumbs_update">Please synchonize them</a>.'
+                'You have enabled or changed thumbnails mode. <a href="?do=thumbs_update">Please synchronize them</a>.'
             );
         }