diff options
author | Lukas Reschke <lukas@statuscode.ch> | 2016-08-11 19:37:17 +0200 |
---|---|---|
committer | Lukas Reschke <lukas@statuscode.ch> | 2016-08-11 19:37:17 +0200 |
commit | 8261ccce1be32c1467874d537240585c0d841600 (patch) | |
tree | 2b654700b2069eafbc2562e89621c748632c0e31 /lib/private/legacy | |
parent | 225eb27bcac1e710a4aba723483745bb3677460f (diff) | |
parent | f68f1d5f37e248aa7e5ac56e34fe79ce184ce149 (diff) | |
download | nextcloud-server-8261ccce1be32c1467874d537240585c0d841600.tar.gz nextcloud-server-8261ccce1be32c1467874d537240585c0d841600.zip |
Merge branch 'master' into implement_712
Diffstat (limited to 'lib/private/legacy')
-rw-r--r-- | lib/private/legacy/app.php | 2 | ||||
-rw-r--r-- | lib/private/legacy/ocs/cloud.php | 28 |
2 files changed, 1 insertions, 29 deletions
diff --git a/lib/private/legacy/app.php b/lib/private/legacy/app.php index 4144f3f6cf5..df76c5b89f0 100644 --- a/lib/private/legacy/app.php +++ b/lib/private/legacy/app.php @@ -995,7 +995,7 @@ class OC_App { $currentVersion = OC_App::getAppVersion($app); if ($currentVersion && isset($versions[$app])) { $installedVersion = $versions[$app]; - if (version_compare($currentVersion, $installedVersion, '>')) { + if (!version_compare($currentVersion, $installedVersion, '=')) { return true; } } diff --git a/lib/private/legacy/ocs/cloud.php b/lib/private/legacy/ocs/cloud.php deleted file mode 100644 index 11152958301..00000000000 --- a/lib/private/legacy/ocs/cloud.php +++ /dev/null @@ -1,28 +0,0 @@ -<?php -/** - * @copyright Copyright (c) 2016, ownCloud, Inc. - * - * @author Roeland Jago Douma <roeland@famdouma.nl> - * @author Thomas Müller <thomas.mueller@tmit.eu> - * - * @license AGPL-3.0 - * - * This code is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License, version 3, - * as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License, version 3, - * along with this program. If not, see <http://www.gnu.org/licenses/> - * - */ - -/** - * @deprecated Since 9.1.0 use \OC\OCS\Cloud - */ -class OC_OCS_Cloud extends \OC\OCS\Cloud { -} |