merge stable

This commit is contained in:
following
2013-03-25 13:06:58 +01:00
6 changed files with 16 additions and 10 deletions

View File

@@ -79,7 +79,7 @@ function cracklib_checkpw($pw, $addwords)
return false;
// words from pw library are not allowed
if (sql_value("SELECT COUNT(*) FROM `pw_dict` WHERE `pw`='&1'", 0, $pw))
if (sql_value("SELECT COUNT(*) FROM `pw_dict` WHERE `pw`='&1'", 0, $pw) > 0)
return false;
if ($opt['logic']['cracklib'] == true)