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 d61d83cde7ea27ce041ca135f0f6cc13e9cc73be..9871126c46fc911007c9bd22c8d7a5523e7d2477 100644 (file)
--- a/framework/main/classes/helper/html/links/class_HtmlLinkHelper.php
+++ b/framework/main/classes/helper/html/links/class_HtmlLinkHelper.php
@@ -95,7 +95,7 @@ class HtmlLinkHelper extends BaseHtmlHelper implements HelpableTemplate {
                if (is_null($requestInstance)) {
                        // Throw an exception here
                        throw new NullPointerException($helperInstance, self::EXCEPTION_IS_NULL_POINTER);
-               } // END - if
+               }
 
                // Get page (this will throw an exception if not set)
                $command = StringUtils::convertDashesToUnderscores($requestInstance->getRequestElement('command'));
@@ -107,7 +107,7 @@ class HtmlLinkHelper extends BaseHtmlHelper implements HelpableTemplate {
                if (!is_null($linkBase)) {
                        // Then output a deprecation message
                        $helperInstance->deprecationWarning('[' . __METHOD__ . ':' . __LINE__ . ']:  linkBase is deprecated. Please remove it from your templates and add a config entry ' . $configEntry . ' in your config.php file.');
-               } // END - if
+               }
 
                // Determine link base from config now and 'command' request
                try {
@@ -118,7 +118,7 @@ class HtmlLinkHelper extends BaseHtmlHelper implements HelpableTemplate {
                        if (is_null($linkBase)) {
                                // Then throw again the exception
                                throw new NoConfigEntryException(array(__CLASS__, ($configEntry)), FrameworkConfiguration::EXCEPTION_CONFIG_ENTRY_WAS_NOT_FOUND);
-                       } // END - if
+                       }
                }
 
                // Set link base
@@ -202,7 +202,7 @@ class HtmlLinkHelper extends BaseHtmlHelper implements HelpableTemplate {
                if ($this->ifGroupOpenedPreviously()) {
                        // Then close it
                        $this->closePreviousGroupByContent('');
-               } // END - if
+               }
 
                // Get the content
                $content = $this->renderContent();
@@ -228,7 +228,7 @@ class HtmlLinkHelper extends BaseHtmlHelper implements HelpableTemplate {
                if ($this->ifGroupOpenedPreviously()) {
                        // Then close it here
                        $this->closePreviousGroupByContent('');
-               } // END - if
+               }
 
                // Generate the group content
                $content = sprintf('<%s id="group_%s_%s">%s',
@@ -257,13 +257,13 @@ class HtmlLinkHelper extends BaseHtmlHelper implements HelpableTemplate {
                if ($this->ifGroupOpenedPreviously() === false) {
                        // No group was opened before!
                        throw new NoGroupOpenedException(array($this, $groupNote), self::EXCEPTION_GROUP_NOT_OPENED);
-               } // END - if
+               }
 
                // Is a previous sub group open?
                if ($this->ifSubGroupOpenedPreviously()) {
                        // Then close it
                        $this->closePreviousSubGroupByContent('</' . $groupCode . '>');
-               } // END - if
+               }
 
                // Generate the group content
                $content = sprintf('<%s id="subgroup_%s_%s">%s',
@@ -290,7 +290,7 @@ class HtmlLinkHelper extends BaseHtmlHelper implements HelpableTemplate {
                if ($this->ifGroupOpenedPreviously() === false) {
                        // No group was opened before!
                        throw new NoGroupOpenedException(array($this, $linkAction . '(' . $linkText . ')'), self::EXCEPTION_GROUP_NOT_OPENED);
-               } // END - if
+               }
 
                // Default parameter SEPARATOR is &amp;
                $separator = self::EXTRA_PARAMETER_SEPARATOR;
@@ -300,7 +300,7 @@ class HtmlLinkHelper extends BaseHtmlHelper implements HelpableTemplate {
                if (count($linkArray) == 0) {
                        // No question mark
                        $separator = self::FIRST_PARAMETER_SEPARATOR;
-               } // END - if
+               }
 
                // Prepare action
                $action = sprintf('%saction=%s',