Merge pull request #24540 from owncloud/stable9-do-not-automatically-try-to-enable-index-php-less-urls

[Stable9] do not automatically try to enable index php less urls

2 files changed, 45 insertions, 0 deletions

diff --git a/core/command/maintenance/updatehtaccess.php b/core/command/maintenance/updatehtaccess.php
new file mode 100644
index 00000000000..ad5bf5d8bde
--- /dev/null
+++ b/core/command/maintenance/updatehtaccess.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * @author Lukas Reschke <lukas@owncloud.com>
+ *
+ * @copyright Copyright (c) 2016, ownCloud, Inc.
+ * @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/>
+ *
+ */
+namespace OC\Core\Command\Maintenance;
+
+use InvalidArgumentException;
+use OC\Setup;
+use OCP\IConfig;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class UpdateHtaccess extends Command {
+
+	protected function configure() {
+		$this
+			->setName('maintenance:update:htaccess')
+			->setDescription('Updates the .htaccess file');
+	}
+
+	protected function execute(InputInterface $input, OutputInterface $output) {
+		\OC\Setup::updateHtaccess();
+		$output->writeln('.htaccess has been updated');
+		return 0;
+	}
+}
diff --git a/core/register_command.php b/core/register_command.php
index e06ff436f50..b074339f4c3 100644
--- a/core/register_command.php
+++ b/core/register_command.php
@@ -113,6 +113,7 @@ if (\OC::$server->getConfig()->getSystemValue('installed', false)) {
 	$application->add(new OC\Core\Command\Maintenance\Mode(\OC::$server->getConfig()));
 	$application->add(new OC\Core\Command\Maintenance\Repair(new \OC\Repair(\OC\Repair::getRepairSteps()), \OC::$server->getConfig()));
 	$application->add(new OC\Core\Command\Maintenance\SingleUser(\OC::$server->getConfig()));
+	$application->add(new OC\Core\Command\Maintenance\UpdateHtaccess());
 
 	$application->add(new OC\Core\Command\Upgrade(
 		\OC::$server->getConfig(),