mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-04-19 20:21:51 +02:00
Code Issues Releases Wiki Activity

Fixes #965 - Fatal error on Social plugin.

Browse Source
This commit is contained in:
Cameron 2015-05-20 11:20:22 -07:00
parent 29e660fdea
commit 715d99f48c
5 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
e107_plugins/gallery/plugin.xml
View File

@ -7,7 +7,7 @@
<link url='admin_gallery.php' description='LAN_CONFIGURE' icon='images/gallery_32.png' iconSmall='images/gallery_16.png' primary='true' >LAN_CONFIGURE</link>
</adminLinks>
<siteLinks>
<link url="{e_PLUGIN}gallery/gallery.php" sef="index" perm="everyone" >LAN_PLUGIN_GALLERY_TITLE</link>
<link url="{e_PLUGIN}gallery/gallery.php" perm="everyone" >LAN_PLUGIN_GALLERY_TITLE</link>
</siteLinks>
<mainPrefs>
</mainPrefs>

2
e107_plugins/gsitemap/plugin.xml
View File

@ -7,7 +7,7 @@
<link url='admin_config.php' description='Configure gSitemap' icon='images/icon.png' iconSmall='images/icon_16.png' primary='true' >LAN_CONFIGURE</link>
</adminLinks>
<siteLinks>
<link name="" url="gsitemap.php?show" sef="index" lan="GSLAN_Name">Sitemap</link>
<link name="" url="gsitemap.php?show" lan="GSLAN_Name">Sitemap</link>
</siteLinks>
<pluginPrefs>
</pluginPrefs>

2
e107_plugins/login_menu/login_menu_shortcodes.php
View File

@ -133,7 +133,7 @@ global $tp;
function sc_lm_loginbutton($parm='')
{
return "<input class='button btn login' type='submit' name='userlogin' id='userlogin' value='".LOGIN_MENU_L28."' />";
return "<input class='button btn btn-default login' type='submit' name='userlogin' id='userlogin' value='".LOGIN_MENU_L28."' />";
}
function sc_lm_rememberme($parm='')

2
e107_plugins/social/e_admin.php
View File

@ -13,7 +13,7 @@ class social_admin
{
$pref = e107::pref('core','social_login');
if(!empty($pref))
if(!empty($pref) && is_array($pref['Twitter']))
{
$this->twitterActive = vartrue($pref['Twitter']['keys']['key']);
}

6
e107_plugins/social/e_header.php
View File

@ -5,7 +5,11 @@ if(USER_AREA)
e107::css('social', 'css/fontello.css');
$social = e107::pref('core','social_login');
$appID = vartrue($social['Facebook']['keys']['id']);
if(!empty($social) && is_array($social))
{
$appID = vartrue($social['Facebook']['keys']['id']);
}
if(!empty($appID))
{