Merge pull request 'Proxify functionality is removed' (#1495) from heluecht/friendica-addons:noproxy into develop
Reviewed-on: https://git.friendi.ca/friendica/friendica-addons/pulls/1495pull/1499/head
commit
739041b74f
|
@ -9,12 +9,10 @@
|
|||
*
|
||||
*/
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\Cache\Enum\Duration;
|
||||
use Friendica\Core\Hook;
|
||||
use Friendica\Core\Renderer;
|
||||
use Friendica\DI;
|
||||
use Friendica\Util\Proxy as ProxyUtils;
|
||||
|
||||
function curweather_install()
|
||||
{
|
||||
|
@ -127,7 +125,7 @@ function curweather_network_mod_init(string &$body)
|
|||
$t = Renderer::getMarkupTemplate("widget.tpl", "addon/curweather/" );
|
||||
$curweather = Renderer::replaceMacros($t, [
|
||||
'$title' => DI::l10n()->t("Current Weather"),
|
||||
'$icon' => ProxyUtils::proxifyUrl('http://openweathermap.org/img/w/'.$res['icon'].'.png'),
|
||||
'$icon' => 'http://openweathermap.org/img/w/'.$res['icon'].'.png',
|
||||
'$city' => $res['city'],
|
||||
'$lon' => $res['lon'],
|
||||
'$lat' => $res['lat'],
|
||||
|
|
|
@ -15,7 +15,6 @@ use Friendica\Core\Cache\Enum\Duration;
|
|||
use Friendica\Core\Hook;
|
||||
use Friendica\Core\Protocol;
|
||||
use Friendica\DI;
|
||||
use Friendica\Util\Proxy as ProxyUtils;
|
||||
|
||||
function mastodoncustomemojis_install()
|
||||
{
|
||||
|
@ -88,7 +87,7 @@ function mastodoncustomemojis_fetch_custom_emojis_for_url($api_base_url)
|
|||
foreach ($emojis_array as $emoji) {
|
||||
if (!empty($emoji['shortcode']) && !empty($emoji['static_url'])) {
|
||||
$return['texts'][] = ':' . $emoji['shortcode'] . ':';
|
||||
$return['icons'][] = '<img class="emoji mastodon" src="' . ProxyUtils::proxifyUrl($emoji['static_url']) . '" alt=":' . $emoji['shortcode'] . ':" title=":' . $emoji['shortcode'] . ':"/>';
|
||||
$return['icons'][] = '<img class="emoji mastodon" src="' . $emoji['static_url'] . '" alt=":' . $emoji['shortcode'] . ':" title=":' . $emoji['shortcode'] . ':"/>';
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue