dprevot/php-sqlsrv
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Changed helper methods as per review

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

2
test/functional/sqlsrv/MsCommon.inc
View file

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

12
test/functional/sqlsrv/MsHelper.inc
View file

@ -331,11 +331,7 @@ function getSeqPlaceholders($num)
function isColEncrypted() function isColEncrypted()
{ {
global $keystore; global $keystore;
if ($keystore === KEYSTORE_NONE) { return ($keystore !== KEYSTORE_NONE);
return false;
} else {
return true;
}
} }
/** /**
@ -345,11 +341,7 @@ function isColEncrypted()
function isDataEncrypted() function isDataEncrypted()
{ {
global $keystore, $dataEncrypted; global $keystore, $dataEncrypted;
if ($keystore === KEYSTORE_NONE || !$dataEncrypted) { return ($keystore !== KEYSTORE_NONE && $dataEncrypted);
return false;
} else {
return true;
}
} }
/** /**