X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=inc%2Fclasses%2Fmain%2Fhelper%2Fweb%2Flinks%2Fclass_WebLinkHelper.php;h=4ea1819b1b40d7a425690948a2566fca79a9d2ff;hp=8fb87c37db102a8a30c71ad7ae12d52a33a62bdc;hb=b05d623fe74bb3366ff0229941918ab7f1e08c0b;hpb=4b88c118b615335d06bd74e444173d21aef4406c;ds=sidebyside diff --git a/inc/classes/main/helper/web/links/class_WebLinkHelper.php b/inc/classes/main/helper/web/links/class_WebLinkHelper.php index 8fb87c37..4ea1819b 100644 --- a/inc/classes/main/helper/web/links/class_WebLinkHelper.php +++ b/inc/classes/main/helper/web/links/class_WebLinkHelper.php @@ -35,12 +35,12 @@ class WebLinkHelper extends BaseWebHelper implements HelpableTemplate { /** * First parameter seperator */ - private $firstParameter = '?'; + const FIRST_PARAMETER_SEPERATOR = '?'; /** * Seperator for more paraemters */ - private $parameterSeperator = '&'; + const EXTRA_PARAMETER_SEPERATOR = '&'; /** * Protected constructor @@ -61,7 +61,7 @@ class WebLinkHelper extends BaseWebHelper implements HelpableTemplate { * @return $helperInstance A prepared instance of this helper * @throws NoConfigEntryException A deprecated exception at this point */ - public static final function createWebLinkHelper (CompileableTemplate $templateInstance, $linkName, $linkBase = null) { + public static final function createWebLinkHelper (CompileableTemplate $templateInstance, $linkName, $linkBase = NULL) { // Get new instance $helperInstance = new WebLinkHelper(); @@ -92,7 +92,7 @@ class WebLinkHelper extends BaseWebHelper implements HelpableTemplate { // Is the deprecated parameter set? if (!is_null($linkBase)) { // Then output a deprecation message - $helperInstance->deprecationWarning(__METHOD__ . ': linkBase is deprecated. Please remove it from your templates and add a config entry ' . $configEntry . ' in your config.php file.'); + $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 'page' request @@ -277,13 +277,13 @@ class WebLinkHelper extends BaseWebHelper implements HelpableTemplate { } // END - if // Default parameter seperator is & - $seperator = $this->parameterSeperator; + $seperator = self::EXTRA_PARAMETER_SEPERATOR; // Is there a question mark in? - $linkArray = explode($this->firstParameter, $this->getLinkBase()); + $linkArray = explode(self::FIRST_PARAMETER_SEPERATOR, $this->getLinkBase()); if (count($linkArray) == 0) { // No question mark - $seperator = $this->firstParameter; + $seperator = self::FIRST_PARAMETER_SEPERATOR; } // END - if // Prepare action