diff --git a/application/Updater.php b/application/Updater.php index 03d93a6..40a1590 100644 --- a/application/Updater.php +++ b/application/Updater.php @@ -328,21 +328,6 @@ class Updater return rename('inc/user.css', 'data/user.css'); } - /** - * While the new default theme is in an unstable state - * continue to use the vintage theme - */ - public function updateMethodDefaultThemeVintage() - { - if ($this->conf->get('resource.theme') !== 'default') { - return true; - } - $this->conf->set('resource.theme', 'vintage'); - $this->conf->write($this->isLoggedIn); - - return true; - } - /** * * `markdown_escape` is a new setting, set to true as default. * diff --git a/tests/Updater/UpdaterTest.php b/tests/Updater/UpdaterTest.php index 11b6444..fed175d 100644 --- a/tests/Updater/UpdaterTest.php +++ b/tests/Updater/UpdaterTest.php @@ -469,46 +469,6 @@ $GLOBALS[\'privateLinkByDefault\'] = true;'; rmdir('sandbox/'. $theme); } - /** - * Test updateMethodDefaultThemeVintage with the default theme enabled. - */ - public function testSetDefaultThemeToVintage() - { - $sandboxConf = 'sandbox/config'; - copy(self::$configFile . '.json.php', $sandboxConf . '.json.php'); - $this->conf = new ConfigManager($sandboxConf); - - $this->conf->set('resource.theme', 'default'); - $updater = new Updater([], [], $this->conf, true); - $this->assertTrue($updater->updateMethodDefaultThemeVintage()); - $this->assertEquals('vintage', $this->conf->get('resource.theme')); - - // reload from file - $this->conf = new ConfigManager($sandboxConf); - $this->assertEquals('vintage', $this->conf->get('resource.theme')); - } - - /** - * Test updateMethodDefaultThemeVintage with custom theme enabled => nothing to do. - */ - public function testSetDefaultThemeNothingToDo() - { - $sandboxConf = 'sandbox/config'; - copy(self::$configFile . '.json.php', $sandboxConf . '.json.php'); - $this->conf = new ConfigManager($sandboxConf); - - $theme = 'myawesometheme'; - $this->conf->set('resource.theme', $theme); - $this->conf->write(true); - $updater = new Updater([], [], $this->conf, true); - $this->assertTrue($updater->updateMethodDefaultThemeVintage()); - $this->assertEquals($theme, $this->conf->get('resource.theme')); - - // reload from file - $this->conf = new ConfigManager($sandboxConf); - $this->assertEquals($theme, $this->conf->get('resource.theme')); - } - /** * Test updateMethodEscapeMarkdown with markdown plugin enabled * => setting markdown_escape set to false.