Fix race-condition in saving user preferences and loading plugin config (#1...

Aleksander Machniak

2015-06-16 26a00e76bed78b67443d22faf5664967ce96cbf7

 composer.json-dist

@@ -9,11 +9,11 @@
        },
        {
            "type": "composer",
            "url": "http://plugins.roundcube.net/"
            "url": "https://plugins.roundcube.net/"
        },
        {
            "type": "vcs",
            "url": "git://git.kolab.org/git/pear/Net_LDAP3"
            "url": "https://git.kolab.org/diffusion/PNL/php-net_ldap.git"
        },
        {
            "type": "package",
@@ -21,7 +21,7 @@
                "name": "Net_SMTP",
                "version": "dev-master",
                "source": {
                    "url": "http://github.com/pear/Net_SMTP",
                    "url": "https://github.com/pear/Net_SMTP",
                    "type": "git",
                    "reference": "master"
                }
@@ -31,12 +31,12 @@
    "require": {
        "php": ">=5.3.7",
        "roundcube/plugin-installer": ">=0.1.5",
        "pear/mail_mime": ">=1.8.9",
        "pear/mail_mime-decode": ">=1.5.5",
        "pear/net_smtp": "dev-master",
        "pear-pear.php.net/auth_sasl": ">=1.0.6",
        "pear-pear.php.net/net_idna2": ">=0.1.1",
        "pear-pear.php.net/net_sieve": ">=1.3.2",
        "pear/mail_mime": ">=1.8.9",
        "pear/net_smtp": "dev-master",
        "pear/mail_mime-decode": ">=1.5.5",
        "patchwork/utf8": "1.2.x"
    },
    "require-dev": {
@@ -44,7 +44,7 @@
        "phpunit/phpunit": "*"
    },
    "suggest": {
        "pear-pear.php.net/net_ldap2": "Version >=2.0.12 required for connecting to LDAP address books",
        "pear-pear.php.net/net_ldap2": ">=2.0.12 required for connecting to LDAP address books",
        "kolab/Net_LDAP3": "dev-master required for connecting to LDAP address books"
    },
    "minimum-stability": "dev"