Merge branch 'develop' into rewrites/dbm_is_result

[friendica.git] / include / network.php

diff --git a/include/network.php b/include/network.php
index 8b67aa627e75b5d38d11d94cf180bbab35e207de..7a662e4cbf08585a3a1bed493c060ab0418a600a 100644 (file)
--- a/include/network.php
+++ b/include/network.php
@@ -398,7 +398,7 @@ function validate_url(&$url) {
        if(substr($url,0,4) != 'http')
                $url = 'http://' . $url;
 
-       // @TODO Really supress function outcomes? Why not find them + debug them?
+       /// @TODO Really supress function outcomes? Why not find them + debug them?
        $h = @parse_url($url);
 
        if((is_array($h)) && (dns_get_record($h['host'], DNS_A + DNS_CNAME + DNS_PTR) || filter_var($h['host'], FILTER_VALIDATE_IP) )) {
@@ -513,8 +513,6 @@ function allowed_email($email) {
 
 function avatar_img($email) {
 
-       $a = get_app();
-
        $avatar['size'] = 175;
        $avatar['email'] = $email;
        $avatar['url'] = '';
@@ -522,8 +520,9 @@ function avatar_img($email) {
 
        call_hooks('avatar_lookup', $avatar);
 
-       if(! $avatar['success'])
-               $avatar['url'] = $a->get_baseurl() . '/images/person-175.jpg';
+       if (! $avatar['success']) {
+               $avatar['url'] = App::get_baseurl() . '/images/person-175.jpg';
+       }
 
        logger('Avatar: ' . $avatar['email'] . ' ' . $avatar['url'], LOGGER_DEBUG);
        return $avatar['url'];
@@ -569,7 +568,7 @@ function scale_external_images($srctext, $include_link = true, $scale_replace =
                foreach($matches as $mtch) {
                        logger('scale_external_image: ' . $mtch[1]);
 
-                       $hostname = str_replace('www.','',substr($a->get_baseurl(),strpos($a->get_baseurl(),'://')+3));
+                       $hostname = str_replace('www.','',substr(App::get_baseurl(),strpos(App::get_baseurl(),'://')+3));
                        if(stristr($mtch[1],$hostname))
                                continue;