From 262a149cabef8587af5511e612ee8a765c33b11b Mon Sep 17 00:00:00 2001
From: rabuzarus <trebor@central-unit>
Date: Wed, 16 Nov 2016 01:14:14 +0100
Subject: [PATCH] Bugfix: "remove_baseurl" wasn't work correct if called
statically
---
boot.php | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/boot.php b/boot.php
index 230cbc1e3a..7e76df87e3 100644
--- a/boot.php
+++ b/boot.php
@@ -1041,7 +1041,7 @@ class App {
/**
* @brief Removes the baseurl from an url. This avoids some mixed content problems.
*
- * @param string $url
+ * @param string $orig_url
*
* @return string The cleaned url
*/
@@ -1049,13 +1049,13 @@ class App {
// Is the function called statically?
if (!is_object($this)) {
- return(self::$a->remove_baseurl($url));
+ return(self::$a->remove_baseurl($orig_url));
}
// Remove the hostname from the url if it is an internal link
- $url = normalise_link($orig_url);
+ $nurl = normalise_link($orig_url);
$base = normalise_link($this->get_baseurl());
- $url = str_replace($base."/", "", $url);
+ $url = str_replace($base."/", "", $nurl);
// if it is an external link return the orignal value
if ($url == normalise_link($orig_url)) {