Knah-Tsaeb/MyShaarli
Knah-Tsaeb/MyShaarli
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #868 from ArthurHoaro/theme/default-as-default

Browse source 
Use the new 'default' theme... as default
This commit is contained in:
ArthurHoaro 2017-05-10 18:25:56 +02:00 committed by GitHub
commit 61c15aa555
2 changed files with 0 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
application/Updater.php
View file

@ -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.
*

40
tests/Updater/UpdaterTest.php
View file

@ -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.