Merge remote-tracking branch 'origin/release/3.2'

This commit is contained in:
Dylan K. Taylor 2018-08-07 12:34:07 +01:00
commit bd993b2342

View File

@ -267,10 +267,6 @@ abstract class PluginBase implements Plugin{
public function reloadConfig(){
$this->saveDefaultConfig();
$this->config = new Config($this->configFile);
if(($configStream = $this->getResource("config.yml")) !== null){
$this->config->setDefaults(yaml_parse(Config::fixYAMLIndexes(stream_get_contents($configStream))));
fclose($configStream);
}
}
/**