Changes in trunk/wp-includes/class-phpass.php [13429:17678]

File:

• trunk/wp-includes/class-phpass.php (modified) (4 diffs)

trunk/wp-includes/class-phpass.php

@@ -4 +4 @@
  * @package phpass
  * @since 2.5
- * @version 0.2 / genuine.
+ * @version 0.3 / WordPress
  * @link http://www.openwall.com/phpass/
  */
@@ -10 +10 @@
 #
 # Written by Solar Designer <solar at openwall.com> in 2004-2006 and placed in
-# the public domain.
+# the public domain.  Revised in subsequent years, still public domain.
 #
 # There's absolutely no warranty.
@@ -30 +30 @@
  *
  * @package phpass
- * @version 0.2 / genuine.
+ * @version 0.3 / WordPress
  * @link http://www.openwall.com/phpass/
  * @since 2.5
@@ -115 +115 @@
             $output = '*1';
 
-        if (substr($setting, 0, 3) != '$P$')
+        $id = substr($setting, 0, 3);
+        # We use "$P$", phpBB3 uses "$H$" for the same thing
+        if ($id != '$P$' && $id != '$H$')
             return $output;