]> source.dussan.org Git - nextcloud-server.git/commitdiff
avoid conflict with physical file config.js
authorThomas Müller <thomas.mueller@tmit.eu>
Tue, 31 Dec 2013 13:34:28 +0000 (14:34 +0100)
committerThomas Müller <thomas.mueller@tmit.eu>
Tue, 31 Dec 2013 13:34:28 +0000 (14:34 +0100)
core/routes.php

index 5009243d59f6e5f229bb467f7d261958c927325a..f8454877e034dbe4b3a44bdac5b912c44cbef0cf 100644 (file)
@@ -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')