[Pkg-owncloud-commits] [owncloud] 50/70: Merge pull request #9500 from owncloud/fix9475

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit a78293dd3f2056f6dd0c7c20e15e40913b52d421
Merge: 1ce9ba1 03c1302
Author: blizzz <blizzz at owncloud.com>
Date:   Tue Jul 8 16:30:09 2014 +0200

    Merge pull request #9500 from owncloud/fix9475
    
    Avoid unnecessary writing to the DB when prefrences are not changed in fact

 apps/user_ldap/user_ldap.php                       |   1 -
 lib/private/appconfig.php                          |   4 +
 lib/private/preferences.php                        |  11 +-
 tests/lib/appconfig.php                            |  66 +++++++
 .../{preferences.php => preferences-singleton.php} |  60 ++++++
 tests/lib/preferences.php                          | 219 ++++++---------------
 6 files changed, 200 insertions(+), 161 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git