Permalink
Browse files

Merge branch 'develop' into autoload

* develop:
  [#7797] Avoid E_NOTICE from array_diff_assoc change in 5.4

Conflicts:
	xpdo/xpdo.class.php
  • Loading branch information...
opengeek committed May 9, 2012
2 parents 328b0bc + 1c556d4 commit 5e0068abc1789cc198ebb3325d1d4877a5957073
Showing with 1 addition and 0 deletions.
  1. +1 −0 xpdo/changelog.txt
View
@@ -1,5 +1,6 @@
This file shows the changes in this release of xPDO.
+- [#7797] Avoid E_NOTICE from array_diff_assoc change in 5.4
- Prefix indexes with table name for sqlite
- Fix lazy loading of fields on demand
- [#7607] xPDOObject->get(array) triggering invalid lazy loading

0 comments on commit 5e0068a

Please sign in to comment.