mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-07-24 16:31:48 +02:00
Code Issues Releases Wiki Activity

Fix for check_class tests.

Browse Source
This commit is contained in:
Cameron
2019-03-08 12:10:28 -08:00
parent d05d4f6406
commit 94bdbfa7e2
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
class2.php
View File

@@ -1559,7 +1559,11 @@ function check_class($var, $userclass = USERCLASS_LIST, $uid = 0)
if(e107::isCli())
{
return true;
global $_E107;
if(empty($_E107['phpunit']))
{
return true;
}
}
if(is_numeric($uid) && $uid > 0)

9
e107_plugins/social/e_admin.php
View File

@@ -27,7 +27,7 @@ class social_admin
* @param $ui admin-ui object
* @return array
*/
public function config($ui)
public function config(e_admin_ui $ui)
{
$action = $ui->getAction(); // current mode: create, edit, list
$type = $ui->getEventName(); // 'wmessage', 'news' etc.
@@ -85,7 +85,7 @@ class social_admin
$data['news_id'] = $id;
$shareData = array(
'title' => $data['news_title'],
'title' => $tp->post_toHTML($data['news_title']),
'url' => e107::getUrl()->create('news/view/item', $data, 'full=1'),
'hashtags' => $data['news_meta_keywords']
);
@@ -96,8 +96,8 @@ class social_admin
<div class="media">
<div class="media-left">'.$tp->toImage($data['news_thumbnail'][0], array('w'=>100, 'h'=>100, 'class'=>'media-object')).'</div>
<div class="media-body">
<h4 class="media-header">'.$data['news_title'].'</h4>
<p><small>'.$data['news_meta_description']."</small></p>".$this->share($shareData).'
<h4 class="media-header">'.$tp->post_toHTML($data['news_title']).'</h4>
<p><small>'.$tp->post_toHTML($data['news_meta_description'])."</small></p>".$this->share($shareData).'
</div>
</div>
</div>
@@ -118,6 +118,7 @@ class social_admin
{
// $pref = e107::pref('social');
/** @var social_shortcodes $soc */
$soc = e107::getScBatch('social');
$tp = e107::getParser();