diff --git a/lib/myprofilelib.php b/lib/myprofilelib.php index 9b99d8bfb61..044d5595dcd 100644 --- a/lib/myprofilelib.php +++ b/lib/myprofilelib.php @@ -339,34 +339,19 @@ function core_myprofile_navigation(core_user\output\myprofile\tree $tree, $user, } if ($user->skype && !isset($hiddenfields['skypeid'])) { - $imurl = 'skype:'.urlencode($user->skype).'?call'; - $iconurl = new moodle_url('http://mystatus.skype.com/smallicon/'.urlencode($user->skype)); - if (is_https()) { - // Bad luck, skype devs are lazy to set up SSL on their servers - see MDL-37233. - $statusicon = ''; - } else { - $statusicon = html_writer::empty_tag('img', - array('src' => $iconurl, 'class' => 'icon icon-post', 'alt' => get_string('status'))); - } - + $imurl = 'skype:' . urlencode($user->skype) . '?call'; $node = new core_user\output\myprofile\node('contact', 'skypeid', get_string('skypeid'), null, null, - html_writer::link($imurl, s($user->skype) . $statusicon)); + html_writer::link($imurl, s($user->skype))); $tree->add_node($node); } if ($user->yahoo && !isset($hiddenfields['yahooid'])) { - $imurl = new moodle_url('https://edit.yahoo.com/config/send_webmesg', array('.target' => $user->yahoo, '.src' => 'pg')); - $iconurl = new moodle_url('http://opi.yahoo.com/online', array('u' => $user->yahoo, 'm' => 'g', 't' => '0')); - $statusicon = html_writer::tag('img', '', - array('src' => $iconurl, 'class' => 'iconsmall icon-post', 'alt' => get_string('status'))); - $node = new core_user\output\myprofile\node('contact', 'yahooid', get_string('yahooid'), null, null, - html_writer::link($imurl, s($user->yahoo) . $statusicon)); + s($user->yahoo)); $tree->add_node($node); } if ($user->aim && !isset($hiddenfields['aimid'])) { - $imurl = 'aim:goim?screenname='.urlencode($user->aim); $node = new core_user\output\myprofile\node('contact', 'aimid', get_string('aimid'), null, null, - html_writer::link($imurl, s($user->aim))); + s($user->aim)); $tree->add_node($node); } if ($user->msn && !isset($hiddenfields['msnid'])) {