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

Notice removal

Browse Source
This commit is contained in:
Cameron
2013-04-29 19:40:16 -07:00
parent 7ed6d9b9da
commit 8b3b865815
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -203,7 +203,7 @@ class news_shortcodes extends e_shortcode
function sc_pdficon() function sc_pdficon()
{ {
$pref = e107::getPref(); $pref = e107::getPref();
if (!$pref['plug_installed']['pdf']) { return ''; } if (!varset($pref['plug_installed']['pdf'])) { return ''; }
return e107::getParser()->parseTemplate('{PDF='.LAN_NEWS_24.'^news.'.$this->news_item['news_id'].'}'); return e107::getParser()->parseTemplate('{PDF='.LAN_NEWS_24.'^news.'.$this->news_item['news_id'].'}');
} }
@@ -325,10 +325,11 @@ class news_shortcodes extends e_shortcode
{ {
return ''; return '';
} }
if($this->news_item['news_thumbnail'][0] == '{' ) // Always resize. Use {SETIMAGE: w=x&y=x&crop=0} PRIOR to calling shortcode to change. if($this->news_item['news_thumbnail'][0] == '{' ) // Always resize. Use {SETIMAGE: w=x&y=x&crop=0} PRIOR to calling shortcode to change.
{ {
$src = $tp->thumbUrl($this->news_item['news_thumbnail'],"w={$w}&h={$h}"); $src = $tp->thumbUrl($this->news_item['news_thumbnail']);
} }
else else
{ {

10
e107_plugins/chatbox_menu/chatbox_menu.php
View File

@@ -111,7 +111,7 @@ class chatbox_shortcodes extends e_shortcode
function sc_cb_avatar($parm='') function sc_cb_avatar($parm='')
{ {
return e107::getParser()->parseTemplate("{USER_AVATAR=".$this->var['user_image']."}"); return e107::getParser()->parseTemplate("{USER_AVATAR=".vartrue($this->var['user_image'])."}");
} }
function sc_cb_bullet($parm = '') function sc_cb_bullet($parm = '')
@@ -316,14 +316,14 @@ if(!$text = $e107cache->retrieve("nq_chatbox"))
// the good way in this case - it works with any object having sc_*, models too // the good way in this case - it works with any object having sc_*, models too
$sc = new chatbox_shortcodes(); $sc = new chatbox_shortcodes();
if($sql->gen($qry)) if($sql->gen($qry))
{ {
$cbpost = $sql->db_getList(); $cbpost = $sql->db_getList();
$text .= "<div id='chatbox-posts-block'>\n"; $text .= "<div id='chatbox-posts-block'>\n";
$text .= $tp->parseTemplate($CHATBOX_TEMPLATE['start'], false, $sc); $text .= $tp->parseTemplate($CHATBOX_TEMPLATE['start'], false, $sc);
foreach($cbpost as $cb) foreach($cbpost as $cb)
{ {
$sc->setVars($cb); $sc->setVars($cb);
@@ -331,7 +331,7 @@ if(!$text = $e107cache->retrieve("nq_chatbox"))
} }
$text .= $tp->parseTemplate($CHATBOX_TEMPLATE['end'], false, $sc); $text .= $tp->parseTemplate($CHATBOX_TEMPLATE['end'], false, $sc);
$text .= "</div>"; $text .= "</div>";
} }
else else