composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-23 18:48:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into feature/4517-from-dev

Browse Source 
# Conflicts:
#	CONTRIBUTING.md
#	composer.lock
#	core/designdocument.class.inc.php
#	lib/composer/installed.json
#	lib/composer/installed.php
This commit is contained in:
Molkobain
2022-07-28 10:30:25 +02:00
parent 6d025479c6 ee783257d9
commit 86e1f165cd
246 changed files with 19028 additions and 20326 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sources/Application/UI/Base/Component/Button/ButtonUIBlockFactory.php
View File

@@ -424,11 +424,11 @@ class ButtonUIBlockFactory extends AbstractUIBlockFactory
$oButton->SetActionType($sActionType)
->SetColor($sColor);
if (utils::StrLen($sValue) > 0) {
if (utils::IsNotNullOrEmptyString($sValue)) {
$oButton->SetValue($sValue);
}
if (utils::StrLen($sName) > 0) {
if (utils::IsNotNullOrEmptyString($sName)) {
$oButton->SetName($sName);
}

2
sources/Application/UI/Base/Component/Input/InputWithLabel.php
View File

@@ -135,7 +135,7 @@ class InputWithLabel extends UIBlock
*/
public function HasDescription(): bool
{
return utils::StrLen($this->sDescription) > 0;
return utils::IsNotNullOrEmptyString($this->sDescription);
}
}