summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorJörn Friedrich Dreyer <jfd@butonic.de>2014-01-07 22:28:58 -0800
committerJörn Friedrich Dreyer <jfd@butonic.de>2014-01-07 22:28:58 -0800
commitf356894aa3f30c12cf4d6da0a98e1c0cd2881865 (patch)
tree16b0c426f0e5ab30a4d9b2bb914539f99f8d9727 /core
parenta7d0ab96c100a5a94b36bf7b311df02e1606a1d2 (diff)
parent6254f0a403e315461f8e20ebccf71cb91e9313a3 (diff)
downloadnextcloud-server-f356894aa3f30c12cf4d6da0a98e1c0cd2881865.tar.gz
nextcloud-server-f356894aa3f30c12cf4d6da0a98e1c0cd2881865.zip
Merge pull request #6594 from owncloud/kill-index.php-from-url
Kill index.php from url
Diffstat (limited to 'core')
-rw-r--r--core/routes.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/routes.php b/core/routes.php
index 5009243d59f..f8454877e03 100644
--- a/core/routes.php
+++ b/core/routes.php
@@ -7,6 +7,7 @@
*/
// Post installation check
+/** @var $this OC_Router */
$this->create('post_setup_check', '/post-setup-check')
->action('OC_Setup', 'postSetupCheck');
@@ -61,7 +62,7 @@ $this->create('core_tags_delete', '/tags/{type}/delete')
->action('OC\Core\Tags\Controller', 'deleteTags')
->requirements(array('type'));
// oC JS config
-$this->create('js_config', '/core/js/config.js')
+$this->create('js_config', '/core/js/oc.js')
->actionInclude('core/js/config.php');
// Routing
$this->create('core_ajax_routes', '/core/routes.json')