use strlen() replace empty()

This commit is contained in:
annProg
2020-09-30 22:51:49 +08:00
committed by Molkobain
parent 03190b95cf
commit 664dd12241

View File

@@ -114,21 +114,12 @@ class CriterionToOQL extends CriterionConversionAbstract
return addslashes($aValues[$iIndex]['value']); return addslashes($aValues[$iIndex]['value']);
} }
private static function IsEmpty($sValue)
{
if ($sValue === "0")
{
return false;
}
return empty($sValue);
}
protected static function ContainsToOql($oSearch, $sRef, $aCriteria) protected static function ContainsToOql($oSearch, $sRef, $aCriteria)
{ {
$aValues = self::GetValues($aCriteria); $aValues = self::GetValues($aCriteria);
$sValue = self::GetValue($aValues, 0); $sValue = self::GetValue($aValues, 0);
if (self::IsEmpty($sValue)) if (!strlen($sValue))
{ {
return "1"; return "1";
} }
@@ -141,7 +132,7 @@ class CriterionToOQL extends CriterionConversionAbstract
$aValues = self::GetValues($aCriteria); $aValues = self::GetValues($aCriteria);
$sValue = self::GetValue($aValues, 0); $sValue = self::GetValue($aValues, 0);
if (self::IsEmpty($sValue)) if (!strlen($sValue))
{ {
return "1"; return "1";
} }
@@ -154,7 +145,7 @@ class CriterionToOQL extends CriterionConversionAbstract
$aValues = self::GetValues($aCriteria); $aValues = self::GetValues($aCriteria);
$sValue = self::GetValue($aValues, 0); $sValue = self::GetValue($aValues, 0);
if (self::IsEmpty($sValue)) if (!strlen($sValue))
{ {
return "1"; return "1";
} }
@@ -171,7 +162,7 @@ class CriterionToOQL extends CriterionConversionAbstract
return "({$sRef} = '0')"; return "({$sRef} = '0')";
} }
if (self::IsEmpty($sValue) && (!(isset($aCriteria['has_undefined'])) || !($aCriteria['has_undefined']))) if (!strlen($sValue) && (!(isset($aCriteria['has_undefined'])) || !($aCriteria['has_undefined'])))
{ {
return "1"; return "1";
} }
@@ -184,7 +175,7 @@ class CriterionToOQL extends CriterionConversionAbstract
$aValues = self::GetValues($aCriteria); $aValues = self::GetValues($aCriteria);
$sValue = self::GetValue($aValues, 0); $sValue = self::GetValue($aValues, 0);
if (self::IsEmpty($sValue)) if (!strlen($sValue))
{ {
return "1"; return "1";
} }