1
0
mirror of https://github.com/e107inc/e107.git synced 2025-01-18 05:09:05 +01:00

Changed {EXTENDED} shortcode to use LAN_MORE when EXTENDEDSTRING is not defined.

Added LAN_MORE to LAN file.
This commit is contained in:
Moc 2013-05-01 00:10:06 +02:00
parent d164c80dae
commit 70cabd4669
2 changed files with 7 additions and 10 deletions

View File

@ -232,21 +232,17 @@ class news_shortcodes extends e_shortcode
if ($this->news_item['news_extended'] && ($this->param['current_action'] != 'extend' || $parm == 'force'))
{
if (defined('PRE_EXTENDEDSTRING'))
{
$es1 = PRE_EXTENDEDSTRING;
}
if (defined('POST_EXTENDEDSTRING'))
{
$es2 = POST_EXTENDEDSTRING;
}
$es = (defined('EXTENDEDSTRING')) ? EXTENDEDSTRING : LAN_MORE;
$es1 = (defined('PRE_EXTENDEDSTRING')) ? PRE_EXTENDEDSTRING : '';
$es2 = (defined('POST_EXTENDEDSTRING')) ? POST_EXTENDEDSTRING : '';
if (deftrue('ADMIN_AREA') && isset($_POST['preview']))
{
return $es1.EXTENDEDSTRING.$es2."<br />".$this->news_item['news_extended'];
return $es1.$es.$es2."<br />".$this->news_item['news_extended'];
}
else
{
return $es1."<a href='".e107::getUrl()->create('news/view/item', $this->news_item)."'>".EXTENDEDSTRING."</a>".$es2;
return $es1."<a href='".e107::getUrl()->create('news/view/item', $this->news_item)."'>".$es."</a>".$es2;
}
}
return '';

View File

@ -44,6 +44,7 @@ define('CORE_LAN_MB', 'MB');
define('CORE_LAN_GB', 'GB');
define('CORE_LAN_TB', 'TB');
define('LAN_MORE', 'More..');
define('LAN_WARNING', 'Warning!');
define('LAN_ERROR', 'Error');