diff --git a/lib/session/control.inc b/lib/session/control.inc index 28010d8..1e9f677 100644 --- a/lib/session/control.inc +++ b/lib/session/control.inc @@ -48,15 +48,13 @@ function controllerRedirect($sAction, $sQueryString) { function generateLink($sTargetPage, $sQueryString, $sLinkText = "") { global $default; - $default->log->debug("generateLink ($sTargetPage, $sQueryString, $sLinkText)"); - if (strlen($sQueryString) > 0) { $sQueryStringDelimiter = (strstr($sTargetPage, "?") ? "&" : "?"); } $sLink = "http" . ($default->sslEnabled ? "s" : "") . "://" . $default->serverName . ((substr($sTargetPage, 0, strlen($default->owl_root_url)) != $default->owl_root_url) ? $default->owl_root_url : "") . $sTargetPage . $sQueryStringDelimiter . $sQueryString; - $default->log->debug("generateLink: returning $sLink"); + return (strlen($sLinkText) > 0) ? "$sLinkText" : $sLink; }