mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-05-10 14:15:24 +02:00
Code Issues Releases Wiki Activity

Fixes #4306 - google-plus removal.

Browse Source
This commit is contained in:
Cameron 2020-12-29 07:00:39 -08:00
parent cf566bbf14
commit baed9ec8e5
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
e107_plugins/social/e_shortcode.php
View File

@ -70,7 +70,7 @@ class social_shortcodes extends e_shortcode
'rss' => array('href'=> (e107::isInstalled('rss_menu') ? e107::url('rss_menu', 'index', array('rss_url'=>'news')) : ''), 'title'=>'RSS/Atom Feed'), 'rss' => array('href'=> (e107::isInstalled('rss_menu') ? e107::url('rss_menu', 'index', array('rss_url'=>'news')) : ''), 'title'=>'RSS/Atom Feed'),
'facebook' => array('href'=> deftrue('XURL_FACEBOOK'), 'title'=>'Facebook'), 'facebook' => array('href'=> deftrue('XURL_FACEBOOK'), 'title'=>'Facebook'),
'twitter' => array('href'=> deftrue('XURL_TWITTER'), 'title'=>'Twitter'), 'twitter' => array('href'=> deftrue('XURL_TWITTER'), 'title'=>'Twitter'),
'google-plus' => array('href'=> deftrue('XURL_GOOGLE'), 'title'=>'Google Plus'), // 'google-plus' => array('href'=> deftrue('XURL_GOOGLE'), 'title'=>'Google Plus'),
'linkedin' => array('href'=> deftrue('XURL_LINKEDIN'), 'title'=>'LinkedIn'), 'linkedin' => array('href'=> deftrue('XURL_LINKEDIN'), 'title'=>'LinkedIn'),
'github' => array('href'=> deftrue('XURL_GITHUB'), 'title'=>'Github'), 'github' => array('href'=> deftrue('XURL_GITHUB'), 'title'=>'Github'),
'pinterest' => array('href'=> deftrue('XURL_PINTEREST'), 'title'=>'Pinterest'), 'pinterest' => array('href'=> deftrue('XURL_PINTEREST'), 'title'=>'Pinterest'),
@ -288,7 +288,7 @@ class social_shortcodes extends e_shortcode
if(empty($parm['providers'])) // No parms so use prefs instead. if(empty($parm['providers'])) // No parms so use prefs instead.
{ {
$defaultProviders = array('email' ,'facebook-like', 'facebook-share', 'twitter', 'google-plus1', 'pinterest' , 'stumbleupon', 'reddit', 'digg' ); $defaultProviders = array('email' ,'facebook-like', 'facebook-share', 'twitter', 'pinterest' , 'stumbleupon', 'reddit', 'digg' );
$parm['providers'] = !empty($pref['sharing_providers']) ? array_keys($pref['sharing_providers']) : $defaultProviders; $parm['providers'] = !empty($pref['sharing_providers']) ? array_keys($pref['sharing_providers']) : $defaultProviders;
} }
else else