mirror_php/humhub
1
0
Fork 0
mirror of https://github.com/humhub/humhub.git synced 2025-03-04 15:19:06 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into v0.21-dev

Browse Source
This commit is contained in:
Lucas Bartholemy 2015-11-12 11:19:05 +01:00
commit 23530b9369
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
protected/humhub/modules/content/components/ContentActiveRecord.php
View File

@ -137,7 +137,7 @@ class ContentActiveRecord extends ActiveRecord implements \humhub\modules\conten
$class = $this->wallEntryClass;
$widget = new $class;
$widget->contentObject = $this;
return §widget;
return $widget;
}
return null;

11
protected/humhub/modules/file/widgets/ShowFiles.php
View File

@ -2,6 +2,7 @@
namespace humhub\modules\file\widgets;
use humhub\modules\content\components\ContentActiveRecord;
use humhub\models\Setting;
/**
@ -23,11 +24,13 @@ class ShowFiles extends \yii\base\Widget
*/
public function run()
{
$widget = $this->object->getWallEntryWidget();
if ($this->object instanceof ContentActiveRecord) {
$widget = $this->object->getWallEntryWidget();
// File widget disabled in this wall entry
if ($widget->showFiles === false) {
return;
// File widget disabled in this wall entry
if ($widget->showFiles === false) {
return;
}
}
$blacklisted_objects = explode(',', Setting::GetText('showFilesWidgetBlacklist', 'file'));