Changed helper methods as per review

This commit is contained in:
Jenny Tam 2017-12-20 21:06:07 -08:00
parent 6b209526cd
commit ade886a131
2 changed files with 2 additions and 12 deletions

View file

@ -98,8 +98,6 @@ function startTest($testName)
*/
function endTest($testName)
{
// reset the utf-8 flag
setUTF8Data(false);
echo "Test \"$testName\" completed successfully.\n";
}

View file

@ -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);
}
/**