From f90e09114adabb07b9ead797089d01b7592fad6d Mon Sep 17 00:00:00 2001 From: Cameron Date: Sun, 7 Jun 2015 18:47:51 -0700 Subject: [PATCH] Encoding fixes. FAQ title/description and social 'email' share body. --- e107_plugins/faqs/faqs.php | 2 +- e107_plugins/social/e_shortcode.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/e107_plugins/faqs/faqs.php b/e107_plugins/faqs/faqs.php index 16a7d145b..29aaf693b 100644 --- a/e107_plugins/faqs/faqs.php +++ b/e107_plugins/faqs/faqs.php @@ -417,7 +417,7 @@ class faq while ($rw = $sql->fetch()) { - $rw['faq_sef'] = eHelper::title2sef($rw['faq_question'],'dashl'); + $rw['faq_sef'] = eHelper::title2sef($tp->toText($rw['faq_question']),'dashl'); $sc->setVars($rw); diff --git a/e107_plugins/social/e_shortcode.php b/e107_plugins/social/e_shortcode.php index 5ea5f6689..5d6e1bb71 100644 --- a/e107_plugins/social/e_shortcode.php +++ b/e107_plugins/social/e_shortcode.php @@ -23,7 +23,7 @@ class social_shortcodes extends e_shortcode //TODO LANS ie. "Share on [x]" in English_global.php $providers = array( - 'email' => array('icon' => 'e-social-mail', 'title'=>"Email to someone", 'url' => "mailto:EMAIL_RECIPIENT?subject=[t]&body=".urlencode($emailMessage)."[u]"), + 'email' => array('icon' => 'e-social-mail', 'title'=>"Email to someone", 'url' => "mailto:EMAIL_RECIPIENT?subject=[t]&body=".rawurlencode($emailMessage)."[u]"), 'facebook-like' => array('icon' => 'e-social-thumbs-up', 'title'=>"Like on Facebook", 'url' => "http://www.facebook.com/plugins/like.php?href=[u]"), 'facebook-share' => array('icon' => 'e-social-facebook', 'title'=>"Share on Facebook", 'url' => "http://www.facebook.com/sharer.php?u=[u]&t=[t]"), 'twitter' => array('icon' => 'e-social-twitter', 'title'=>"Share on Twitter", 'url' => "http://twitter.com/share?url=[u]&text=[t]"),