Merge pull request #4312 from zeroadam/feature/L10n

[friendica.git] / include / network.php

diff --git a/include/network.php b/include/network.php
index fe502bdb54f8e71653819263318698add57273bf..73fa80f981bb804e8988498bb3c474e26b9f57b5 100644 (file)
--- a/include/network.php
+++ b/include/network.php
@@ -3,6 +3,8 @@
  * @file include/network.php
  */
 use Friendica\App;
+use Friendica\Core\Addon;
+use Friendica\Core\L10n;
 use Friendica\Core\System;
 use Friendica\Core\Config;
 use Friendica\Network\Probe;
@@ -488,7 +490,7 @@ function validate_url($url)
        /// @TODO Really suppress 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) )) {
+       if ((is_array($h)) && (@dns_get_record($h['host'], DNS_A + DNS_CNAME + DNS_PTR) || filter_var($h['host'], FILTER_VALIDATE_IP) )) {
                return $url;
        }
 
@@ -653,7 +655,7 @@ function avatar_img($email)
        $avatar['url'] = '';
        $avatar['success'] = false;
 
-       call_hooks('avatar_lookup', $avatar);
+       Addon::callHooks('avatar_lookup', $avatar);
 
        if (! $avatar['success']) {
                $avatar['url'] = System::baseUrl() . '/images/person-175.jpg';
@@ -736,7 +738,7 @@ function scale_external_images($srctext, $include_link = true, $scale_replace =
                                                        $mtch[0],
                                                        '[img=' . $new_width . 'x' . $new_height. ']' . $scaled . '[/img]'
                                                        . "\n" . (($include_link)
-                                                               ? '[url=' . $mtch[1] . ']' . t('view full size') . '[/url]' . "\n"
+                                                               ? '[url=' . $mtch[1] . ']' . L10n::t('view full size') . '[/url]' . "\n"
                                                                : ''),
                                                        $s
                                                );