Rewrite continued:

[core.git] / framework / main / classes / helper / html / links / class_HtmlLinkHelper.php

diff --git a/framework/main/classes/helper/html/links/class_HtmlLinkHelper.php b/framework/main/classes/helper/html/links/class_HtmlLinkHelper.php
index f38d05e21146e788f1f8212adf8677325bd81b44..b9df4c065b408badfb5ca07d69256aab9b523c07 100644 (file)
--- a/framework/main/classes/helper/html/links/class_HtmlLinkHelper.php
+++ b/framework/main/classes/helper/html/links/class_HtmlLinkHelper.php
@@ -3,6 +3,7 @@
 namespace CoreFramework\Helper;
 
 // Import framework stuff
+use CoreFramework\Bootstrap\FrameworkBootstrap;
 use CoreFramework\Configuration\FrameworkConfiguration;
 use CoreFramework\Generic\NullPointerException;
 use CoreFramework\Registry\Registry;
@@ -84,7 +85,7 @@ class HtmlLinkHelper extends BaseHtmlHelper implements HelpableTemplate {
                $applicationInstance = Registry::getRegistry()->getInstance('application');
 
                // Get the request instance
-               $requestInstance = $applicationInstance->getRequestInstance();
+               $requestInstance = FrameworkBootstrap::getRequestInstance();
 
                // Sanity-check on it
                if (is_null($requestInstance)) {
@@ -249,7 +250,7 @@ class HtmlLinkHelper extends BaseHtmlHelper implements HelpableTemplate {
         */
        public function addLinkNote ($groupId, $groupNote, $groupCode = 'div') {
                // Check if a previous group was opened
-               if ($this->ifGroupOpenedPreviously() === FALSE) {
+               if ($this->ifGroupOpenedPreviously() === false) {
                        // No group was opened before!
                        throw new NoGroupOpenedException(array($this, $groupNote), self::EXCEPTION_GROUP_NOT_OPENED);
                } // END - if
@@ -282,7 +283,7 @@ class HtmlLinkHelper extends BaseHtmlHelper implements HelpableTemplate {
         */
        protected function addActionLink ($linkAction, $linkText, $linkTitle) {
                // Check if a previous group was opened
-               if ($this->ifGroupOpenedPreviously() === FALSE) {
+               if ($this->ifGroupOpenedPreviously() === false) {
                        // No group was opened before!
                        throw new NoGroupOpenedException(array($this, $linkAction . '(' . $linkText . ')'), self::EXCEPTION_GROUP_NOT_OPENED);
                } // END - if