Changed helper methods as per review
This commit is contained in:
parent
6b209526cd
commit
ade886a131
|
@ -98,8 +98,6 @@ function startTest($testName)
|
|||
*/
|
||||
function endTest($testName)
|
||||
{
|
||||
// reset the utf-8 flag
|
||||
setUTF8Data(false);
|
||||
echo "Test \"$testName\" completed successfully.\n";
|
||||
}
|
||||
|
||||
|
|
|
@ -331,11 +331,7 @@ function getSeqPlaceholders($num)
|
|||
function isColEncrypted()
|
||||
{
|
||||
global $keystore;
|
||||
if ($keystore === KEYSTORE_NONE) {
|
||||
return false;
|
||||
} else {
|
||||
return true;
|
||||
}
|
||||
return ($keystore !== KEYSTORE_NONE);
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -345,11 +341,7 @@ function isColEncrypted()
|
|||
function isDataEncrypted()
|
||||
{
|
||||
global $keystore, $dataEncrypted;
|
||||
if ($keystore === KEYSTORE_NONE || !$dataEncrypted) {
|
||||
return false;
|
||||
} else {
|
||||
return true;
|
||||
}
|
||||
return ($keystore !== KEYSTORE_NONE && $dataEncrypted);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
Loading…
Reference in a new issue