Merge pull request #1915 from sjinks/1.2.6

[1.2.6] Fix #1912
phalcon · Jan 26, 2014 · 056d073 · 056d073
2 parents 964552d + 7838041
commit 056d073
Show file tree

Hide file tree

Showing 6 changed files with 515 additions and 484 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,6 @@
+1.2.6
+ - Phalcon\Security::checkHash() now correctly handles non-bcrypt hashes (#1912)
+
 1.2.5
  - Http\Cookie::__toString() will not throw exceptions (#1427)
  - Phalcon\Http\Cookie::__toString() will return a string value (#1428)