diff options
Diffstat (limited to 'application/front/controller/admin/ConfigureController.php')
-rw-r--r-- | application/front/controller/admin/ConfigureController.php | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/application/front/controller/admin/ConfigureController.php b/application/front/controller/admin/ConfigureController.php index 0ed7ad81..eb26ef21 100644 --- a/application/front/controller/admin/ConfigureController.php +++ b/application/front/controller/admin/ConfigureController.php | |||
@@ -51,7 +51,7 @@ class ConfigureController extends ShaarliAdminController | |||
51 | $this->assignView('languages', Languages::getAvailableLanguages()); | 51 | $this->assignView('languages', Languages::getAvailableLanguages()); |
52 | $this->assignView('gd_enabled', extension_loaded('gd')); | 52 | $this->assignView('gd_enabled', extension_loaded('gd')); |
53 | $this->assignView('thumbnails_mode', $this->container->conf->get('thumbnails.mode', Thumbnailer::MODE_NONE)); | 53 | $this->assignView('thumbnails_mode', $this->container->conf->get('thumbnails.mode', Thumbnailer::MODE_NONE)); |
54 | $this->assignView('pagetitle', t('Configure') .' - '. $this->container->conf->get('general.title', 'Shaarli')); | 54 | $this->assignView('pagetitle', t('Configure') . ' - ' . $this->container->conf->get('general.title', 'Shaarli')); |
55 | 55 | ||
56 | return $response->write($this->render(TemplatePage::CONFIGURE)); | 56 | return $response->write($this->render(TemplatePage::CONFIGURE)); |
57 | } | 57 | } |
@@ -95,12 +95,13 @@ class ConfigureController extends ShaarliAdminController | |||
95 | } | 95 | } |
96 | 96 | ||
97 | $thumbnailsMode = extension_loaded('gd') ? $request->getParam('enableThumbnails') : Thumbnailer::MODE_NONE; | 97 | $thumbnailsMode = extension_loaded('gd') ? $request->getParam('enableThumbnails') : Thumbnailer::MODE_NONE; |
98 | if ($thumbnailsMode !== Thumbnailer::MODE_NONE | 98 | if ( |
99 | $thumbnailsMode !== Thumbnailer::MODE_NONE | ||
99 | && $thumbnailsMode !== $this->container->conf->get('thumbnails.mode', Thumbnailer::MODE_NONE) | 100 | && $thumbnailsMode !== $this->container->conf->get('thumbnails.mode', Thumbnailer::MODE_NONE) |
100 | ) { | 101 | ) { |
101 | $this->saveWarningMessage( | 102 | $this->saveWarningMessage( |
102 | t('You have enabled or changed thumbnails mode.') . | 103 | t('You have enabled or changed thumbnails mode.') . |
103 | '<a href="'. $this->container->basePath .'/admin/thumbnails">' . t('Please synchronize them.') .'</a>' | 104 | '<a href="' . $this->container->basePath . '/admin/thumbnails">' . t('Please synchronize them.') . '</a>' |
104 | ); | 105 | ); |
105 | } | 106 | } |
106 | $this->container->conf->set('thumbnails.mode', $thumbnailsMode); | 107 | $this->container->conf->set('thumbnails.mode', $thumbnailsMode); |