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

Moved all social prefs (login/xurls etc) into the "Social" plugin admin area. Extended admin-ui with renderHelp() method for adding a help panel from within the admin-ui.

Browse Source
This commit is contained in:
Cameron
2015-04-08 20:20:10 -07:00
parent 1078c9c84c
commit d543ab71ff
9 changed files with 363 additions and 255 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
e107_core/shortcodes/batch/admin_shortcodes.php
View File

@@ -137,6 +137,12 @@ class admin_shortcodes
$ns = e107::getRender();
$pref = e107::getPref();
if($tmp = e107::getRegistry('core/e107/adminui/help'))
{
return $ns->tablerender($tmp['caption'],$tmp['text'],'e_help',true);
}
if(function_exists('e_help') && ($tmp = e_help())) // new in v2.x for non-admin-ui admin pages.
{

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

@@ -30,6 +30,8 @@ class news_shortcodes extends e_shortcode
//protected $param; - shouldn't be set - see __set/__get methods of e_shortcode & news::render_newsitem()
protected $commentsDisabled;
protected $commentsEngine = 'e107';
private $imageItem;
@@ -42,6 +44,11 @@ class news_shortcodes extends e_shortcode
$pref = e107::getPref();
$this->commentsDisabled = vartrue($pref['comments_disabled']);
if(!empty($pref['comments_engine']))
{
$this->commentsEngine = $pref['comments_engine'];
}
}
function sc_newstitle()
@@ -269,9 +276,9 @@ class news_shortcodes extends e_shortcode
*/
function sc_newscommentcount($parm='')
{
if($this->commentsDisabled)
if($this->commentsDisabled || ($this->commentsEngine != 'e107'))
{
return;
return;
}
$text = varset($parm['glyph']) ? e107::getParser()->toGlyph($parm['glyph']) : "";