]> git.mxchange.org Git - core.git/commitdiff
Configuration data is now being inserted as same as other data.
authorRoland Haeder <roland@mxchange.org>
Sun, 5 Apr 2015 23:01:43 +0000 (01:01 +0200)
committerRoland Haeder <roland@mxchange.org>
Sun, 5 Apr 2015 23:01:43 +0000 (01:01 +0200)
Signed-off-by: Roland Häder <roland@mxchange.org>
inc/classes/main/template/class_BaseTemplateEngine.php
inc/classes/main/template/menu/class_MenuTemplateEngine.php

index 4f896266b3d292cd8b98bde19178472aac2e649e..ba5208cb3e7bc3b9ac8b1d5ef52ebebe2ce5fcc6 100644 (file)
@@ -1188,7 +1188,7 @@ class BaseTemplateEngine extends BaseFrameworkSystem {
 
                // Sweet and simple...
                //* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('BASE-TEMPLATE[' . __METHOD__ . ':' . __LINE__ . ']: variableName=' . $variableName . ',getConfigEntry()=' . $this->getConfigInstance()->getConfigEntry($variableName));
-               $this->setVariable('config', $variableName, $this->getConfigInstance()->getConfigEntry($variableName));
+               $this->assignVariable($variableName, $this->getConfigInstance()->getConfigEntry($variableName));
        }
 
        /**
index d118bae7b03124f7c185f0de1141e00381ec8dca..62997fa86258deb1507480cd99bc8a86ef558af2 100644 (file)
@@ -762,7 +762,6 @@ class MenuTemplateEngine extends BaseTemplateEngine implements CompileableTempla
         * Renders this menu entry, as every block all variables got overwritten
         * with data from next entry.
         *
-        * @todo        'anchor_href' may needs expanding with full URL
         * @return      void
         */
        private function renderMenuEntry () {
@@ -777,6 +776,12 @@ class MenuTemplateEngine extends BaseTemplateEngine implements CompileableTempla
                        // Copy variable
                        $variableValue = $this->readVariable($variableName);
 
+                       // Is the key 'anchor-href'?
+                       if ($variableName == 'anchor-href') {
+                               // Expand variable with URL then
+                               $variableValue = '{?base_url?}/' . $variableValue;
+                       } // END - if
+
                        // ... into the instance
                        $templateInstance->assignVariable($variableName, $variableValue);
                } // END - foreach