mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-08 07:36:32 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' of https://github.com/e107inc/e107

Browse Source
This commit is contained in:
Cameron
2014-12-08 18:46:06 -08:00
parent 01d9720121 24433752f7
commit 26634f2bfd
3 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
e107_core/shortcodes/batch/news_shortcodes.php
View File

@@ -212,7 +212,8 @@ class news_shortcodes extends e_shortcode
function sc_newscategory($parm) function sc_newscategory($parm)
{ {
$category_name = e107::getParser()->toHTML($this->news_item['category_name'], FALSE ,'defs'); $category_name = e107::getParser()->toHTML($this->news_item['category_name'], FALSE ,'defs');
return "<a class='".$GLOBALS['NEWS_CSSMODE']."_category' style='".(isset($this->param['catlink']) ? $this->param['catlink'] : "#")."' href='".e107::getUrl()->create('news/list/category', $this->news_item)."'>".$category_name."</a>"; $category = array('id' => $this->news_item['category_id'], 'name' => $this->news_item['category_sef'] );
return "<a class='".$GLOBALS['NEWS_CSSMODE']."_category' style='".(isset($this->param['catlink']) ? $this->param['catlink'] : "#")."' href='".e107::getUrl()->create('news/list/category', $category)."'>".$category_name."</a>";
} }
function sc_newsdate($parm) function sc_newsdate($parm)

6
e107_plugins/login_menu/login_menu.php
View File

@@ -161,7 +161,11 @@ else
{ {
//get templates //get templates
if (!$LOGIN_MENU_FORM || !$LOGIN_MENU_MESSAGE) { if (!$LOGIN_MENU_FORM || !$LOGIN_MENU_MESSAGE) {
if (file_exists(THEME."login_menu_template.php")){ if (file_exists(THEME.'templates/login_menu/login_menu_template.php')) // Preferred v2.x location.
{
require(THEME.'templates/login_menu/login_menu_template.php');
}
elseif (file_exists(THEME."login_menu_template.php")){
require_once(THEME."login_menu_template.php"); require_once(THEME."login_menu_template.php");
}else{ }else{
require_once(e_PLUGIN."login_menu/login_menu_template.php"); require_once(e_PLUGIN."login_menu/login_menu_template.php");

18
e107_plugins/login_menu/login_menu_shortcodes.php
View File

@@ -311,13 +311,13 @@ class login_menu_shortcodes extends e_shortcode
if(!isset($data['new_news'])) return ''; if(!isset($data['new_news'])) return '';
$tmp = array(); $tmp = array();
if($data['new_news']){ if($data['new_news']){
$tmp['LM_STAT_NEW'] = "return '".$data['new_news']."';"; $tmp['LM_STAT_NEW'] = $data['new_news'];
$tmp['LM_STAT_LABEL'] = $data['new_news'] == 1 ? "return '".LOGIN_MENU_L14."';" : "return '".LOGIN_MENU_L15."';"; $tmp['LM_STAT_LABEL'] = $data['new_news'] == 1 ? LOGIN_MENU_L14 : LOGIN_MENU_L15;
$tmp['LM_STAT_EMPTY'] = ''; $tmp['LM_STAT_EMPTY'] = '';
} else { } else {
$tmp['LM_STAT_NEW'] = ''; $tmp['LM_STAT_NEW'] = '';
$tmp['LM_STAT_LABEL'] = ''; $tmp['LM_STAT_LABEL'] = '';
$tmp['LM_STAT_EMPTY'] = "return '".LOGIN_MENU_L26." ".LOGIN_MENU_L15."';"; $tmp['LM_STAT_EMPTY'] = LOGIN_MENU_L26." ".LOGIN_MENU_L15;
} }
return $tp -> parseTemplate($LOGIN_MENU_STATITEM, false, $tmp); return $tp -> parseTemplate($LOGIN_MENU_STATITEM, false, $tmp);
} }
@@ -329,13 +329,13 @@ class login_menu_shortcodes extends e_shortcode
if(!isset($data['new_comments'])) return ''; if(!isset($data['new_comments'])) return '';
$tmp = array(); $tmp = array();
if($data['new_comments']){ if($data['new_comments']){
$tmp['LM_STAT_NEW'] = "return '".$data['new_comments']."';"; $tmp['LM_STAT_NEW'] = $data['new_comments'];
$tmp['LM_STAT_LABEL'] = $data['new_comments'] == 1 ? "return '".LOGIN_MENU_L18."';" : "return '".LOGIN_MENU_L19."';"; $tmp['LM_STAT_LABEL'] = $data['new_comments'] == 1 ? LOGIN_MENU_L18 : LOGIN_MENU_L19;
$tmp['LM_STAT_EMPTY'] = ''; $tmp['LM_STAT_EMPTY'] = '';
} else { } else {
$tmp['LM_STAT_NEW'] = ''; $tmp['LM_STAT_NEW'] = '';
$tmp['LM_STAT_LABEL'] = ''; $tmp['LM_STAT_LABEL'] = '';
$tmp['LM_STAT_EMPTY'] = "return '".LOGIN_MENU_L26." ".LOGIN_MENU_L19."';"; $tmp['LM_STAT_EMPTY'] = LOGIN_MENU_L26." ".LOGIN_MENU_L19;
} }
return $tp -> parseTemplate($LOGIN_MENU_STATITEM, false, $tmp); return $tp -> parseTemplate($LOGIN_MENU_STATITEM, false, $tmp);
} }
@@ -347,13 +347,13 @@ class login_menu_shortcodes extends e_shortcode
if(!isset($data['new_users'])) return ''; if(!isset($data['new_users'])) return '';
$tmp = array(); $tmp = array();
if($data['new_users']){ if($data['new_users']){
$tmp['LM_STAT_NEW'] = "return '".$data['new_users']."';"; $tmp['LM_STAT_NEW'] = $data['new_users'];
$tmp['LM_STAT_LABEL'] = $data['new_users'] == 1 ? "return '".LOGIN_MENU_L22."';" : "return '".LOGIN_MENU_L23."';"; $tmp['LM_STAT_LABEL'] = $data['new_users'] == 1 ? LOGIN_MENU_L22 : LOGIN_MENU_L23;
$tmp['LM_STAT_EMPTY'] = ''; $tmp['LM_STAT_EMPTY'] = '';
} else { } else {
$tmp['LM_STAT_NEW'] = ''; $tmp['LM_STAT_NEW'] = '';
$tmp['LM_STAT_LABEL'] = ''; $tmp['LM_STAT_LABEL'] = '';
$tmp['LM_STAT_EMPTY'] = "return '".LOGIN_MENU_L26." ".LOGIN_MENU_L23."';"; $tmp['LM_STAT_EMPTY'] = LOGIN_MENU_L26." ".LOGIN_MENU_L23;
} }
return $tp -> parseTemplate($LOGIN_MENU_STATITEM, false, $tmp); return $tp -> parseTemplate($LOGIN_MENU_STATITEM, false, $tmp);
} }