Move containing <div> rendering of UIControl to new template, add new custom Twig tag to render Views and allow selected segment of segment selector to be determined by PHP code.

1 files changed, 4 insertions, 2 deletions

diff --git a/core/View.php b/core/View.php
index ba60198ddd..b0d8e5562f 100644
--- a/core/View.php
+++ b/core/View.php
@@ -150,11 +150,13 @@ class View implements ViewInterface
     /**
      * Returns the variables to bind to the template when rendering.
      *
+     * @param array $override Template variable override values. Mainly useful
+     *                        when including View templates in other templates.
      * @return array
      */
-    public function getTemplateVars()
+    public function getTemplateVars($override = array())
     {
-        return $this->templateVars;
+        return $override + $this->templateVars;
     }
 
     /**