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

Merge branch 'master' of github.com:humhub/humhub

Browse Source
This commit is contained in:
Lucas Bartholemy 2018-07-03 13:07:48 +02:00
commit 550357481b
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
protected/humhub/widgets/BootstrapComponent.php
View File

@ -25,6 +25,7 @@ abstract class BootstrapComponent extends Widget
public $type;
public $htmlOptions = [];
public $text;
public $encode = false;
public $_icon;
public $_iconRight;
@ -314,11 +315,12 @@ abstract class BootstrapComponent extends Widget
protected function getText()
{
$text = ($this->encode) ? Html::encode($this->text) : $this->text;
if ($this->_icon) {
return ($this->_iconRight) ? $this->text.' '.$this->_icon : $this->_icon.' '.$this->text;
return ($this->_iconRight) ? $text.' '.$this->_icon : $this->_icon.' '.$text;
}
return $this->text;
return $text;
}
public function visible($isVisible = true) {
@ -344,6 +346,7 @@ abstract class BootstrapComponent extends Widget
'type' => $this->type,
'text' => $this->text,
'htmlOptions' => $this->htmlOptions,
'encode' => $this->encode,
'_icon' => $this->_icon,
'_iconRight' => $this->_iconRight,
'render' => $this->_visible

1
protected/humhub/widgets/Label.php
View File

@ -23,6 +23,7 @@ class Label extends BootstrapComponent
{
public $_sortOrder = 1000;
public $encode = true;
public function sortOrder($sortOrder)
{