From 9090550d241f9f7b3246b24bfd323bd988add749 Mon Sep 17 00:00:00 2001 From: vincent-peugnet Date: Tue, 28 Apr 2020 20:18:17 +0200 Subject: listen to brother Stan and clean some things --- app/class/Modelrender.php | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'app/class/Modelrender.php') diff --git a/app/class/Modelrender.php b/app/class/Modelrender.php index 4722057..fd8531a 100644 --- a/app/class/Modelrender.php +++ b/app/class/Modelrender.php @@ -17,8 +17,6 @@ class Modelrender extends Modelpage protected $internallinkblank = ''; protected $externallinkblank = ''; - public const RENDER_VERBOSE = 1; - public function __construct(\AltoRouter $router) { parent::__construct(); @@ -162,7 +160,7 @@ class Modelrender extends Modelpage if ($source !== $this->page->id()) { $subcontent = $this->getpageelement($source, $type); if ($subcontent !== false) { - if (empty($subcontent && self::RENDER_VERBOSE > 0)) { + if (empty($subcontent)) { $message = 'The ' . strtoupper($type) . ' from page "' . $source . '" is currently empty !'; $subcontent = "\n\n"; } @@ -216,12 +214,12 @@ class Modelrender extends Modelpage public function writetemplates() { - if (array_key_exists('css', $this->page->template('array'))) { - $tempaltecsspage = $this->get($this->page->template('array')['css']); + if (array_key_exists('css', $this->page->template())) { + $tempaltecsspage = $this->get($this->page->template()['css']); file_put_contents(Model::RENDER_DIR . $tempaltecsspage->id() . '.css', $tempaltecsspage->css()); } - if (array_key_exists('javascript', $this->page->template('array'))) { - $templatejspage = $this->get($this->page->template('array')['javascript']); + if (array_key_exists('javascript', $this->page->template())) { + $templatejspage = $this->get($this->page->template()['javascript']); file_put_contents(Model::RENDER_DIR . $templatejspage->id() . '.js', $templatejspage->javascript()); } } @@ -547,7 +545,7 @@ class Modelrender extends Modelpage if (!empty($matches)) { foreach ($matches as $match) { - $medialist = new Medialist($match); + $medialist = new Mediaopt($match); $medialist->readoptions(); $text = str_replace($medialist->fullmatch(), $medialist->generatecontent(), $text); } -- cgit v1.2.3