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

Issue #59 - Corrected issue - 'news_style' function was not being utilized as intended.

Browse Source
This commit is contained in:
Cameron
2013-01-15 14:37:36 -08:00
parent cbd3dffc3e
commit d5c3722b28
2 changed files with 33 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
e107_admin/newspost.php
View File

@@ -990,7 +990,7 @@ class admin_newspost
if(isset($_POST['etrigger_ecolumns'])) //elseif fails. if(isset($_POST['etrigger_ecolumns'])) //elseif fails.
{ {
$this->_observe_saveColumns(); // $this->_observe_saveColumns();
} }
} }

35
news.php
View File

@@ -238,7 +238,10 @@ if ($action == 'cat' || $action == 'all' || vartrue($_GET['tag']))
}*/ }*/
if(vartrue($NEWSLISTSTYLE)) $template = $NEWSLISTSTYLE; if(vartrue($NEWSLISTSTYLE))
{
$template = $NEWSLISTSTYLE;
}
else else
{ {
$tmp = e107::getTemplate('news', 'news', 'list'); $tmp = e107::getTemplate('news', 'news', 'list');
@@ -398,7 +401,15 @@ if ($action == 'extend')
$param = array(); $param = array();
$param['current_action'] = $action; $param['current_action'] = $action;
if(vartrue($NEWSSTYLE)) $template = $NEWSSTYLE;
if(vartrue($NEWSSTYLE))
{
$template = $NEWSSTYLE;
}
elseif(function_exists("news_style")) // BC
{
$template = news_style($news, 'extend', $param);
}
else else
{ {
$tmp = e107::getTemplate('news', 'news', 'view'); $tmp = e107::getTemplate('news', 'news', 'view');
@@ -732,6 +743,24 @@ else
$param = array(); $param = array();
$param['current_action'] = $action; $param['current_action'] = $action;
// Get Correct Template
if(vartrue($NEWSSTYLE))
{
$template = $NEWSSTYLE;
}
elseif(function_exists("news_style")) // BC
{
$template = news_style($news, $action, $param);
}
else
{
$tmp = e107::getTemplate('news', 'news', 'view');
$template = $tmp['item'];
unset($tmp);
}
// NEW - news category title when in list // NEW - news category title when in list
if($sub_action && 'list' == $action && vartrue($newsAr[1]['category_name'])) if($sub_action && 'list' == $action && vartrue($newsAr[1]['category_name']))
{ {
@@ -764,7 +793,7 @@ else
{ {
unset($news['news_render_type']); unset($news['news_render_type']);
} }
// $template = false;
$ix->render_newsitem($news, 'default', '', $template, $param); $ix->render_newsitem($news, 'default', '', $template, $param);
$i++; $i++;
} }