The branch "imp_6_2" has been updated. The following is a summary of the commits.
from: df30133c23d1b83e8d8c6c591fa3bb6429fc5f5a df6090b Fix undefined error when custom strict fields don't exist in a turba driver 84b0cd5 Do not force the database when one is explicitly specified. cb0653d Don't need to override this anymore. 77652bc Avoid E_STRICT warnings. cceb2d8 Return the currently selected database by default. cea45ad phpdoc 9c74bb2 [mms] getAvatarUrl() now returns a Horde_Url object. 8129a59 [mms] Change second parameter to getAvatarUrl() and fetchAvatar() to an array so that additional options can be provided. ffbb528 [mms] Add 'default' and 'rating' options to getAvatarUrl(). 48706c4 Merge branch 'master' into imp_6_2 Summary: http://github.com/horde/horde/compare/df30133c23d1b83e8d8c6c591fa3bb6429fc5f5a...48706c4b41ddb8a484cd655adb62a7f3601c8950 ----------------------------------------------------------------------- commit df6090b661783dc5eff54aaca6da359799833a54 Author: Michael M Slusarz <[email protected]> Date: Wed Oct 2 12:52:00 2013 -0600 Fix undefined error when custom strict fields don't exist in a turba driver turba/lib/Driver.php | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) http://github.com/horde/horde/commit/df6090b661783dc5eff54aaca6da359799833a54 http://git.horde.org/horde-git/-/commit/df6090b661783dc5eff54aaca6da359799833a54 ----------------------------------------------------------------------- commit 84b0cd595d0d537811495d47ce83ff82902c1265 Author: Michael J Rubinsky <[email protected]> Date: Wed Oct 2 22:29:18 2013 -0400 Do not force the database when one is explicitly specified. It is EXTREMELY dangerous to do this. E.g., $client = new Horde_Mongo_Client(); // This inserts into 'horde' even though you specify 'test_database'. $client->test_database->my_collection->insert($document); // This completely nukes your 'horde' database. $client->test_database->drop(); framework/Mongo/lib/Horde/Mongo/Client.php | 23 +++++++++++++++-------- 1 files changed, 15 insertions(+), 8 deletions(-) http://github.com/horde/horde/commit/84b0cd595d0d537811495d47ce83ff82902c1265 http://git.horde.org/horde-git/-/commit/84b0cd595d0d537811495d47ce83ff82902c1265 ----------------------------------------------------------------------- commit cb0653d27443136121afeb21fe06a2eae07408b0 Author: Michael J Rubinsky <[email protected]> Date: Thu Oct 3 13:58:27 2013 -0400 Don't need to override this anymore. framework/Mongo/lib/Horde/Mongo/Client.php | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-) http://github.com/horde/horde/commit/cb0653d27443136121afeb21fe06a2eae07408b0 http://git.horde.org/horde-git/-/commit/cb0653d27443136121afeb21fe06a2eae07408b0 ----------------------------------------------------------------------- commit 77652bccfa7d5d4a44444b3692b423f1b56fb224 Author: Michael J Rubinsky <[email protected]> Date: Thu Oct 3 16:06:36 2013 -0400 Avoid E_STRICT warnings. framework/Mongo/lib/Horde/Mongo/Client.php | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) http://github.com/horde/horde/commit/77652bccfa7d5d4a44444b3692b423f1b56fb224 http://git.horde.org/horde-git/-/commit/77652bccfa7d5d4a44444b3692b423f1b56fb224 ----------------------------------------------------------------------- commit cceb2d89e5f20fccb8979fcadd9b248b0d5629db Author: Michael J Rubinsky <[email protected]> Date: Thu Oct 3 16:22:24 2013 -0400 Return the currently selected database by default. framework/Mongo/lib/Horde/Mongo/Client.php | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) http://github.com/horde/horde/commit/cceb2d89e5f20fccb8979fcadd9b248b0d5629db http://git.horde.org/horde-git/-/commit/cceb2d89e5f20fccb8979fcadd9b248b0d5629db ----------------------------------------------------------------------- commit cea45ada9a0726621c2acf260daf0f8603306a10 Author: Michael M Slusarz <[email protected]> Date: Thu Oct 3 21:05:17 2013 -0600 phpdoc InvalidArgumentException doesn't need to be documented; this is a logic error (as opposed to runtime error). framework/Service_Gravatar/lib/Horde/Service/Gravatar.php | 56 ++--- .../Service_Gravatar/test/Horde/Service/Gravatar/GravatarTest.php | 35 +-- .../Service_Gravatar/test/Horde/Service/Gravatar/ServerTest.php | 35 +-- 3 files changed, 50 insertions(+), 76 deletions(-) http://github.com/horde/horde/commit/cea45ada9a0726621c2acf260daf0f8603306a10 http://git.horde.org/horde-git/-/commit/cea45ada9a0726621c2acf260daf0f8603306a10 ----------------------------------------------------------------------- commit 9c74bb256b1e00f687c14a9c2f0ca7428a7fabc5 Author: Michael M Slusarz <[email protected]> Date: Thu Oct 3 21:09:18 2013 -0600 [mms] getAvatarUrl() now returns a Horde_Url object. framework/Service_Gravatar/lib/Horde/Service/Gravatar.php | 10 ++++++++-- framework/Service_Gravatar/package.xml | 9 +++++++++ 2 files changed, 17 insertions(+), 2 deletions(-) http://github.com/horde/horde/commit/9c74bb256b1e00f687c14a9c2f0ca7428a7fabc5 http://git.horde.org/horde-git/-/commit/9c74bb256b1e00f687c14a9c2f0ca7428a7fabc5 ----------------------------------------------------------------------- commit 8129a59938c74dac471eebbc039ae2ce89d10902 Author: Michael M Slusarz <[email protected]> Date: Thu Oct 3 21:17:08 2013 -0600 [mms] Change second parameter to getAvatarUrl() and fetchAvatar() to an array so that additional options can be provided. framework/Service_Gravatar/lib/Horde/Service/Gravatar.php | 31 ++++++++----- framework/Service_Gravatar/package.xml | 2 + 2 files changed, 22 insertions(+), 11 deletions(-) http://github.com/horde/horde/commit/8129a59938c74dac471eebbc039ae2ce89d10902 http://git.horde.org/horde-git/-/commit/8129a59938c74dac471eebbc039ae2ce89d10902 ----------------------------------------------------------------------- commit ffbb528da40770ee4ed6a512bace54bdb9c940a8 Author: Michael M Slusarz <[email protected]> Date: Thu Oct 3 21:20:11 2013 -0600 [mms] Add 'default' and 'rating' options to getAvatarUrl(). framework/Service_Gravatar/lib/Horde/Service/Gravatar.php | 10 ++++++++++ framework/Service_Gravatar/package.xml | 2 ++ 2 files changed, 12 insertions(+), 0 deletions(-) http://github.com/horde/horde/commit/ffbb528da40770ee4ed6a512bace54bdb9c940a8 http://git.horde.org/horde-git/-/commit/ffbb528da40770ee4ed6a512bace54bdb9c940a8 ----------------------------------------------------------------------- commit 48706c4b41ddb8a484cd655adb62a7f3601c8950 Merge: df30133 ffbb528 Author: Michael M Slusarz <[email protected]> Date: Thu Oct 3 22:25:04 2013 -0600 Merge branch 'master' into imp_6_2 framework/Mongo/lib/Horde/Mongo/Client.php | 26 +- framework/Service_Gravatar/lib/Horde/Service/Gravatar.php | 103 +++-- framework/Service_Gravatar/package.xml | 13 + .../Service_Gravatar/test/Horde/Service/Gravatar/GravatarTest.php | 35 +- .../Service_Gravatar/test/Horde/Service/Gravatar/ServerTest.php | 35 +- turba/lib/Driver.php | 4 +- 6 files changed, 116 insertions(+), 100 deletions(-) http://github.com/horde/horde/commit/48706c4b41ddb8a484cd655adb62a7f3601c8950 http://git.horde.org/horde-git/-/commit/48706c4b41ddb8a484cd655adb62a7f3601c8950 -- commits mailing list Frequently Asked Questions: http://wiki.horde.org/FAQ To unsubscribe, mail: [email protected]
