summaryrefslogtreecommitdiffstats
path: root/lib/private/setup.php
diff options
context:
space:
mode:
authorLukas Reschke <lukas@owncloud.com>2015-12-01 17:04:11 +0100
committerLukas Reschke <lukas@owncloud.com>2015-12-08 08:16:23 +0100
commit235094ab5492990ed4790e5d475beedf3528705a (patch)
treec83938885288ae2796fefb80526e8021f8875abe /lib/private/setup.php
parentb15d77c93459743e5e3e29ebefeba0d6fca11b96 (diff)
downloadnextcloud-server-235094ab5492990ed4790e5d475beedf3528705a.tar.gz
nextcloud-server-235094ab5492990ed4790e5d475beedf3528705a.zip
Remove version check out of .htaccess
This can now be achieved using the new code signing.
Diffstat (limited to 'lib/private/setup.php')
-rw-r--r--lib/private/setup.php20
1 files changed, 0 insertions, 20 deletions
diff --git a/lib/private/setup.php b/lib/private/setup.php
index 814d78679e2..33a9fe44462 100644
--- a/lib/private/setup.php
+++ b/lib/private/setup.php
@@ -395,32 +395,12 @@ class Setup {
}
/**
- * Checks if the .htaccess contains the current version parameter
- *
- * @return bool
- */
- private function isCurrentHtaccess() {
- $version = \OC_Util::getVersion();
- unset($version[3]);
-
- return !strpos(
- file_get_contents($this->pathToHtaccess()),
- 'Version: '.implode('.', $version)
- ) === false;
- }
-
- /**
* Append the correct ErrorDocument path for Apache hosts
- *
- * @throws \OC\HintException If .htaccess does not include the current version
*/
public static function updateHtaccess() {
$setupHelper = new \OC\Setup(\OC::$server->getConfig(), \OC::$server->getIniWrapper(),
\OC::$server->getL10N('lib'), new \OC_Defaults(), \OC::$server->getLogger(),
\OC::$server->getSecureRandom());
- if(!$setupHelper->isCurrentHtaccess()) {
- throw new \OC\HintException('.htaccess file has the wrong version. Please upload the correct version. Maybe you forgot to replace it after updating?');
- }
$htaccessContent = file_get_contents($setupHelper->pathToHtaccess());
$content = '';