]> git.mxchange.org Git - friendica.git/blobdiff - boot.php
Likes would now work with unlikes and with likes on comments.
[friendica.git] / boot.php
index 69440e69d29aa25f8f3566d6ccedd59262b2ce53..d82669f231a9fb12608d3855ea50ea78e7bb6ee2 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -590,15 +590,6 @@ class App {
                if(x($_SERVER,'SERVER_NAME')) {
                        $this->hostname = $_SERVER['SERVER_NAME'];
 
-                       // See bug 437 - this didn't work so disabling it
-                       //if(stristr($this->hostname,'xn--')) {
-                               // PHP or webserver may have converted idn to punycode, so
-                               // convert punycode back to utf-8
-                       //      require_once('library/simplepie/idn/idna_convert.class.php');
-                       //      $x = new idna_convert();
-                       //      $this->hostname = $x->decode($_SERVER['SERVER_NAME']);
-                       //}
-
                        if(x($_SERVER,'SERVER_PORT') && $_SERVER['SERVER_PORT'] != 80 && $_SERVER['SERVER_PORT'] != 443)
                                $this->hostname .= ':' . $_SERVER['SERVER_PORT'];
                        /*
@@ -958,7 +949,7 @@ class App {
 
                // Is the function called statically?
                if (!is_object($this))
-                       return(self::$a->remove_baseurl($ssl));
+                       return(self::$a->remove_baseurl($url));
 
                $url = normalise_link($url);
                $base = normalise_link($this->get_baseurl());