Merge remote-tracking branch 'ispc/stable-3.0.5' into stable-3.0.5

Marius Cramer

2014-08-13 42539643c396f9d8865dcf9a51b13dc869709d16

 interface/lib/classes/validate_password.inc.php

@@ -53,11 +53,12 @@
         $different += 1;
      }

      if (preg_match('/[`~!@#$%^&*()_+|\\=-[]}{\';:\/?.>,<" ]/', $password)) {
      if (preg_match('/[`~!@#$%^&*()_+|\\=-\[\]}{\';:\/?.>,<" ]/', $password)) {
         $points += 1;
         $different += 1;
      }


      if ($points == 0 || $different < 3) {
         if ($length >= 5 && $length <= 6) {
            return 1;