From 988710b0fc4e77b1a565a9f3ee4e7f24a539e057 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Tue, 31 Dec 2013 14:34:28 +0100
Subject: [PATCH] avoid conflict with physical file config.js
---
core/routes.php | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/core/routes.php b/core/routes.php
index 5009243d59..f8454877e0 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')
--
GitLab