[stable9] Write .htaccess also from CLI #24136

Merged
merged 1 commit into from Apr 21, 2016

Projects

None yet

4 participants

@LukasReschke
Member

Approved backport of #24135

@LukasReschke LukasReschke Write .htaccess also from CLI
The new updater as shipped with ownCloud 9.0.x invokes `occ` via `shell_exec`. This means that the `\OC::$CLI` code is used when updating.

This removes the manual `.htaccess` modifications, effectively leading to the fact that URLs without index.php in it stop working. This also affects share URLs which could be considered a rather serious regression.

- User installs 9.0.0 via web
- User shares /s/1234
- User updates to 9.0.1 via ownCloud updater
- Link to /s/1234 is broken, /index.php/s/1234 works
572ff9c
@mention-bot

By analyzing the blame information on this pull request, we identified @nickvergessen, @DeepDiver1975 and @bartv2 to be potential reviewers

@DeepDiver1975
Member

👍

@nickvergessen
Contributor

Works as intended, although it results in pain with developers which always have this files marked as changed in their git installation.... 🙈

👍

@DeepDiver1975 DeepDiver1975 merged commit a4a800f into stable9 Apr 21, 2016

22 checks passed

cla-bot-core Build #3313 succeeded in 1 min 1 sec
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
core-ci-linux-jsunit/database=sqlite,label=SLAVE Build #60969 succeeded in 6 min 25 sec
Details
core-ci-linux-swift-primary-storage/database=mysql,label=SLAVE Build #55104 succeeded in 16 min
Details
core-ci-linux/database=mysql,label=SLAVE Build #29600 succeeded in 31 min
Details
core-ci-linux/database=oci,label=SLAVE Build #29600 succeeded in 59 min
Details
core-ci-linux/database=pgsql,label=SLAVE Build #29600 succeeded in 29 min
Details
core-ci-linux/database=sqlite,label=SLAVE Build #29600 succeeded in 13 min
Details
ocs-api-integration-tests-ci Build #9840 succeeded in 14 min
Details
server-master-linux-externals-ci/database=sqlite,external=smb-silvershell,label=SLAVE Build #9525 succeeded in 4 min 37 sec
Details
server-master-linux-externals-ci/database=sqlite,external=swift-ceph,label=SLAVE Build #9525 succeeded in 5 min 4 sec
Details
server-master-linux-externals-ci/database=sqlite,external=webdav-ownCloud,label=SLAVE Build #9525 succeeded in 8 min 20 sec
Details
server-master-linux-externals-smb-windows-ext-ci/database=sqlite,external=smb-windows,label=master Build #11880 succeeded in 2 min 42 sec
Details
server-master-linux-php5.4-ci/database=sqlite,label=SLAVE Build #2474 succeeded in 6 min 55 sec
Details
server-master-linux-php7-ci/database=sqlite,label=SLAVE Build #37799 succeeded in 11 min
Details
smashbox-on-docker-ci/DOCKER_IMAGE=ubuntu_oc_lamp-git,TEST_NAME=litmus,mirallBranch=v2.0.2,slave=SMASH Build #13840 succeeded in 5 min 45 sec
Details
smashbox-on-docker-ci/DOCKER_IMAGE=ubuntu_oc_lamp-git,TEST_NAME=test_basicSync@0,mirallBranch=v2.0.2,slave=SMASH Build #13840 succeeded in 20 min
Details
smashbox-on-docker-ci/DOCKER_IMAGE=ubuntu_oc_lamp-git,TEST_NAME=test_basicSync@1,mirallBranch=v2.0.2,slave=SMASH Build #13840 succeeded in 32 min
Details
smashbox-on-docker-ci/DOCKER_IMAGE=ubuntu_oc_lamp-git,TEST_NAME=test_shareLink,mirallBranch=v2.0.2,slave=SMASH Build #13840 succeeded in 30 min
Details
smashbox-on-docker-ci/DOCKER_IMAGE=ubuntu_oc_lamp-git,TEST_NAME=test_sharePermissions,mirallBranch=v2.0.2,slave=SMASH Build #13840 succeeded in 18 min
Details
smashbox-on-docker-ci/DOCKER_IMAGE=ubuntu_oc_lamp-git,TEST_NAME=test_sharePropagationGroups,mirallBranch=v2.0.2,slave=SMASH Build #13840 succeeded in 23 min
Details
smashbox-on-docker-ci/DOCKER_IMAGE=ubuntu_oc_lamp-git,TEST_NAME=test_sharePropagationInsideGroups,mirallBranch=v2.0.2,slave=SMASH Build #13840 succeeded in 35 min
Details
@DeepDiver1975 DeepDiver1975 deleted the backport-24135 branch Apr 21, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment