Merge pull request #321 from tobiasd/20151102-itbuffer

[friendica-addons.git] / gravatar / gravatar.php

diff --git a/gravatar/gravatar.php b/gravatar/gravatar.php
index a0b5a02b3ff3c4c72c845b22730aa018a2718163..eb38db78f6cc3859ac37d962c87c4c2c111a2c93 100644 (file)
--- a/gravatar/gravatar.php
+++ b/gravatar/gravatar.php
@@ -42,7 +42,7 @@ function gravatar_lookup($a, &$b) {
 
        $hash = md5(trim(strtolower($b['email'])));
 
-       $url = 'http://www.gravatar.com/avatar/' .$hash .'.jpg';
+       $url = 'https://secure.gravatar.com/avatar/' .$hash .'.jpg';
        $url .= '?s=' .$b['size'] .'&r=' .$rating;
        if ($default_avatar != "gravatar")
                $url .= '&d=' .$default_avatar;
@@ -91,14 +91,8 @@ function gravatar_plugin_admin (&$a, &$o) {
 
        // output Gravatar settings
        $o .= '<input type="hidden" name="form_security_token" value="' .get_form_security_token("gravatarsave") .'">';
-
-       $includes = array(
-               '$field_select' => 'field_select.tpl',
-       );
-       $includes = set_template_includes($a->theme['template_engine'], $includes);
-
-       $o .= replace_macros( $t, $includes + array(
-               '$submit' => t('Submit'),
+       $o .= replace_macros( $t, array(
+               '$submit' => t('Save Settings'),
                '$default_avatar' => array('avatar', t('Default avatar image'), $default_avatar, t('Select default avatar image if none was found at Gravatar. See README'), $default_avatars),
                '$rating' => array('rating', t('Rating of images'), $rating, t('Select the appropriate avatar rating for your site. See README'), $ratings),
        ));