Merge branch 'stable-3.1' into 'stable-3.1'

Marius Burkard

2016-07-05 3cc04cc5219bfd72d83b58d2f6ae83092e0c9fb6

 interface/lib/classes/validate_password.inc.php

@@ -33,6 +33,7 @@
   
   private function _get_password_strength($password) {
      $length = strlen($password);
		
      $points = 0;
      if ($length < 5) {
         return 1;
@@ -53,7 +54,7 @@
         $different += 1;
      }

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