projects
/
core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use of the FrameworkFeature class (which is a manager somehow) +
[core.git]
/
inc
/
classes
/
main
/
scrypt
/
class_Scrypt.php
diff --git
a/inc/classes/main/scrypt/class_Scrypt.php
b/inc/classes/main/scrypt/class_Scrypt.php
index 8a9ec47e3ce08e6e81c2a08e385e53f7aa713c55..e1c7cb9c307abca6b73289c6d52c3a937de527f6 100644
(file)
--- a/
inc/classes/main/scrypt/class_Scrypt.php
+++ b/
inc/classes/main/scrypt/class_Scrypt.php
@@
-130,7
+130,7
@@
abstract class Scrypt extends BaseFrameworkSystem
*/
public static function hashScrypt ($password, $salt = false, $N = 16384, $r = 8, $p = 1)
{
*/
public static function hashScrypt ($password, $salt = false, $N = 16384, $r = 8, $p = 1)
{
- if (
(!FrameworkConfiguration::getSelfInstance()->isConfigEntrySet('extension_scrypt_loaded')) || (FrameworkConfiguration::getSelfInstance()->getConfigEntry('extension_scrypt_loaded') === FALSE
)) {
+ if (
!FrameworkFeature::isFeatureAvailable('hubcoin_reward'
)) {
// Feature has been disabled
throw new \InvalidArgumentException('Feature "scrypt" disabled.');
}
// Feature has been disabled
throw new \InvalidArgumentException('Feature "scrypt" disabled.');
}
@@
-174,7
+174,7
@@
abstract class Scrypt extends BaseFrameworkSystem
return false;
}
return false;
}
- if (
(!FrameworkConfiguration::getSelfInstance()->isConfigEntrySet('extension_scrypt_loaded')) || (FrameworkConfiguration::getSelfInstance()->getConfigEntry('extension_scrypt_loaded') === FALSE
)) {
+ if (
!FrameworkFeature::isFeatureAvailable('hubcoin_reward'
)) {
// Feature has been disabled
throw new \InvalidArgumentException('Feature "scrypt" disabled.');
}
// Feature has been disabled
throw new \InvalidArgumentException('Feature "scrypt" disabled.');
}