X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FApp.php;h=a5c6f34227e7216713301712736912d6bb89c691;hb=5adfeb0bd5fed2f793332056c03bb7c043d5fc69;hp=c416a0b126d180bfda848a4e004607ed2886d5ab;hpb=adf06e9c8105ec9775c2475c09b48767065e52cf;p=friendica.git

diff --git a/src/App.php b/src/App.php
index c416a0b126..a5c6f34227 100644
--- a/src/App.php
+++ b/src/App.php
@@ -370,11 +370,6 @@ class App {
 	 * @return string Friendica server base URL
 	 */
 	function get_baseurl($ssl = false) {
-		// Is the function called statically?
-		if (!(isset($this) && get_class($this) == __CLASS__)) {
-			return self::$a->get_baseurl($ssl);
-		}
-
 		$scheme = $this->scheme;
 
 		if (Config::get('system', 'ssl_policy') == SSL_POLICY_FULL) {
@@ -521,7 +516,7 @@ class App {
 
 		$tpl = get_markup_template('head.tpl');
 		$this->page['htmlhead'] = replace_macros($tpl, array(
-				'$baseurl' => $this->get_baseurl(), // FIXME for z_path!!!!
+				'$baseurl' => $this->get_baseurl(),
 				'$local_user' => local_user(),
 				'$generator' => 'Friendica' . ' ' . FRIENDICA_VERSION,
 				'$delitem' => t('Delete this item?'),
@@ -541,7 +536,7 @@ class App {
 		}
 		$tpl = get_markup_template('end.tpl');
 		$this->page['end'] = replace_macros($tpl, array(
-				'$baseurl' => $this->get_baseurl() // FIXME for z_path!!!!
+				'$baseurl' => $this->get_baseurl()
 			)) . $this->page['end'];
 	}
 
@@ -582,11 +577,6 @@ class App {
 	 */
 	function remove_baseurl($orig_url) {
 
-		// Is the function called statically?
-		if (!(isset($this) && get_class($this) == __CLASS__)) {
-			return self::$a->remove_baseurl($orig_url);
-		}
-
 		// Remove the hostname from the url if it is an internal link
 		$nurl = normalise_link($orig_url);
 		$base = normalise_link($this->get_baseurl());
@@ -760,7 +750,11 @@ class App {
 
 		$callstack = array();
 		foreach ($trace AS $func) {
-			$callstack[] = $func['function'];
+			if (!empty($func['class'])) {
+				$callstack[] = $func['class'].'::'.$func['function'];
+			} else {
+				$callstack[] = $func['function'];
+			}
 		}
 
 		return implode(', ', $callstack);