Remove version check out of .htaccess

This can now be achieved using the new code signing.

diff --git a/.htaccess b/.htaccess
index 230f6ae330f3281ee6195cc6993ab0541281abac..9dc2983a643c64863b533079a5ecad203c9b3425 100644 (file)
--- a/.htaccess
+++ b/.htaccess
@@ -1,4 +1,3 @@
-# Version: 9.0.0
 <IfModule mod_headers.c>
   <IfModule mod_fcgid.c>
     <IfModule mod_setenvif.c>

diff --git a/lib/private/setup.php b/lib/private/setup.php
index 814d78679e276b2a50cd3638961e7bcc31306ac4..33a9fe444627614c49fba7944f6e1b7e383ab63e 100644 (file)
--- a/lib/private/setup.php
+++ b/lib/private/setup.php
@@ -394,33 +394,13 @@ class Setup {
                return \OC::$SERVERROOT.'/.htaccess';
        }
 
-       /**
-        * 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 = '';