Fix for #317 markdown_extra: overriding markdown:extra:

This commit is contained in:
Andy Miller
2015-09-11 09:38:32 -06:00
parent 955e985f4d
commit 572bb429ce

View File

@@ -549,7 +549,7 @@ class Page
}
// pages.markdown_extra is deprecated, but still check it...
if (isset($this->markdown_extra) || $config->get('system.pages.markdown_extra') !== null) {
if (!isset($defaults['extra']) && (isset($this->markdown_extra) || $config->get('system.pages.markdown_extra') !== null)) {
$defaults['extra'] = $this->markdown_extra ?: $config->get('system.pages.markdown_extra');
}