From 345c0ec9592226537b025220a6a695043ffa3fd6 Mon Sep 17 00:00:00 2001 From: Cameron Date: Thu, 4 Apr 2019 11:16:58 -0700 Subject: [PATCH] Fixes #3764 XURL icons now function regardless of FontAwesome version or presence. --- e107_plugins/social/css/fontello.css | 1 + e107_plugins/social/e_shortcode.php | 2 +- e107_plugins/social/templates/social_xurl_template.php | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/e107_plugins/social/css/fontello.css b/e107_plugins/social/css/fontello.css index 5bc1910ce..43281dbe1 100644 --- a/e107_plugins/social/css/fontello.css +++ b/e107_plugins/social/css/fontello.css @@ -56,6 +56,7 @@ } .e-social-gplus:before { content: '\e800'; } /* '' */ +.e-social-google-plus:before { content: '\e800'; } /* '' */ .e-social-stumbleupon:before { content: '\e801'; } /* '' */ .e-social-pinterest:before { content: '\e802'; } /* '' */ .e-social-digg:before { content: '\e803'; } /* '' */ diff --git a/e107_plugins/social/e_shortcode.php b/e107_plugins/social/e_shortcode.php index a1c557543..618097aec 100644 --- a/e107_plugins/social/e_shortcode.php +++ b/e107_plugins/social/e_shortcode.php @@ -59,7 +59,7 @@ class social_shortcodes extends e_shortcode * {XURL_ICONS: size=2x} * {XURL_ICONS: type=facebook,twitter,vimeo} */ - function sc_xurl_icons($parm='') + function sc_xurl_icons($parm=null) { $tp = e107::getParser(); $tmpl = !empty($parm['template']) ? $parm['template'] : 'default'; diff --git a/e107_plugins/social/templates/social_xurl_template.php b/e107_plugins/social/templates/social_xurl_template.php index 36da3c5cb..3f4af59a3 100644 --- a/e107_plugins/social/templates/social_xurl_template.php +++ b/e107_plugins/social/templates/social_xurl_template.php @@ -13,5 +13,5 @@ * {XURL_ICONS} template */ $SOCIAL_XURL_TEMPLATE['default']['start'] = '

'; - $SOCIAL_XURL_TEMPLATE['default']['item'] = ''; + $SOCIAL_XURL_TEMPLATE['default']['item'] = ''; $SOCIAL_XURL_TEMPLATE['default']['end'] = '

';