diff --git a/lib/outputfactories.php b/lib/outputfactories.php index 5ac7300d74f..2d7cabfec45 100644 --- a/lib/outputfactories.php +++ b/lib/outputfactories.php @@ -337,10 +337,7 @@ class standard_renderer_factory extends renderer_factory_base { throw new coding_exception('Request for an unknown renderer class. Searched for: ' . var_export($classnames, true)); } - $renderer = new $classname($page, $target); - $renderer->set_component($component); - $renderer->set_subtype($subtype); - return $renderer; + return new $classname($page, $target); } } @@ -404,10 +401,7 @@ class theme_overridden_renderer_factory extends renderer_factory_base { $newclassname = $prefix . '_' . $classnamedetails['classname'] . $suffix; } if (class_exists($newclassname)) { - $renderer = new $newclassname($page, $target); - $renderer->set_component($component); - $renderer->set_subtype($subtype); - return $renderer; + return new $newclassname($page, $target); } } } @@ -418,10 +412,7 @@ class theme_overridden_renderer_factory extends renderer_factory_base { if (class_exists($newclassname)) { // Use the specialised renderer for given target, default renderer might also decide // to implement support for more targets. - $renderer = new $newclassname($page, $target); - $renderer->set_component($component); - $renderer->set_subtype($subtype); - return $renderer; + return new $newclassname($page, $target); } } } @@ -436,10 +427,7 @@ class theme_overridden_renderer_factory extends renderer_factory_base { $newclassname = $prefix . '_' . $classnamedetails['classname']; } if (class_exists($newclassname)) { - $renderer = new $newclassname($page, $target); - $renderer->set_component($component); - $renderer->set_subtype($subtype); - return $renderer; + return new $newclassname($page, $target); } } } @@ -450,10 +438,7 @@ class theme_overridden_renderer_factory extends renderer_factory_base { if ($classnamedetails['validwithoutprefix']) { $newclassname = $classnamedetails['classname']; if (class_exists($newclassname)) { - $renderer = new $newclassname($page, $target); - $renderer->set_component($component); - $renderer->set_subtype($subtype); - return $renderer; + return new $newclassname($page, $target); } } } diff --git a/lib/outputrenderers.php b/lib/outputrenderers.php index 94229e533de..017bc8bd394 100644 --- a/lib/outputrenderers.php +++ b/lib/outputrenderers.php @@ -71,38 +71,6 @@ class renderer_base { */ private $mustache; - /** - * @var string $component The component used when requesting this renderer. - */ - private $component; - - /** - * @var string $subtype The subtype used when requesting this renderer. - */ - private $subtype; - - /** - * This is not done in the constructor because that would be a - * compatibility breaking change, and we can just pass this always in the - * renderer factory, immediately after creating the renderer. - * @since 2.9 - * @param string $subtype - */ - public function set_subtype($subtype) { - $this->subtype = $subtype; - } - - /** - * This is not done in the constructor because that would be a - * compatibility breaking change, and we can just pass this always in the - * renderer factory, immediately after creating the renderer. - * @since 2.9 - * @param string $component - */ - public function set_component($component) { - $this->component = $component; - } - /** * Return an instance of the mustache class. *