mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-18 12:21:45 +02:00
Code Issues Releases Wiki Activity

PHP Notice and BC Fixes.

Browse Source
This commit is contained in:
Cameron
2016-04-19 16:57:44 -07:00
parent 8023a87aa1
commit 716678a3b7
6 changed files with 51 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -34,6 +34,8 @@ class news_shortcodes extends e_shortcode
protected $commentsEngine = 'e107';
private $imageItem;
public $param = array();
function __construct($eVars = null)
@@ -80,7 +82,10 @@ class news_shortcodes extends e_shortcode
{
$tp = e107::getParser();
e107::getBB()->setClass("news"); // For automatic bbcode image resizing.
$news_body = '';
if($parm != 'extended')
{
$news_body = $tp->toHTML($this->news_item['news_body'], true, 'BODY, fromadmin', $this->news_item['news_author']);
@@ -90,7 +95,9 @@ class news_shortcodes extends e_shortcode
{
$news_body .= $tp->toHTML($this->news_item['news_extended'], true, 'BODY, fromadmin', $this->news_item['news_author']);
}
e107::getBB()->clearClass();
return $news_body;
}
@@ -511,7 +518,8 @@ class news_shortcodes extends e_shortcode
{
$tp = e107::getParser();
$text = $tp->toHtml($this->news_item['news_body'],true);
$text = str_replace("<br />","\n",$text);
$breaks = array('<br />','<br>');
$text = str_replace($breaks,"\n",$text);
$text = strip_tags($text);
$tmp = preg_split('/(\.\s|!|\r|\n|\?)/i', trim($text));
$tmp = array_filter($tmp);
@@ -597,18 +605,23 @@ class news_shortcodes extends e_shortcode
$_src = $src = ($newsThumb[0] == '{' || $parms[1] == 'placeholder') ? e107::getParser()->replaceConstants($newsThumb, 'abs') : e_IMAGE_ABS."newspost_images/".$newsThumb;
if($parms[2] || $parms[1] == 'placeholder')
if(!empty($parms[2]) || $parms[1] == 'placeholder')
{
// $srcset = "srcset='".$tp->thumbSrcSet($src,'all')."' size='100vw' ";
$src = e107::getParser()->thumbUrl($src, $parms[2]);
$attr = !empty($parms[2]) ? $parms[2] : null;
$src = e107::getParser()->thumbUrl($src, $attr);
$dimensions = e107::getParser()->thumbDimensions();
}
}
if(empty($parms[1]))
{
$parms = array(1 => null);
}
switch($parms[1])
{
case 'src':